Rather than use the gcc -fno-builtin-log flag, just rename the 'int log'

variable.
This commit is contained in:
Peter Wemm 2003-10-30 22:56:44 +00:00
parent 457fc53d28
commit e2c617744f
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=121766
2 changed files with 4 additions and 5 deletions

View File

@ -9,7 +9,6 @@ SRCS= inetd.c builtins.c
WARNS?= 2
CFLAGS+= -DLOGIN_CAP
#CFLAGS+= -DSANITY_CHECK
CFLAGS+= -fno-builtin-log
DPADD= ${LIBUTIL} ${LIBWRAP}
LDADD= -lutil -lwrap

View File

@ -252,7 +252,7 @@ int deny_severity;
int wrap_ex = 0;
int wrap_bi = 0;
int debug = 0;
int log = 0;
int dolog = 0;
int maxsock; /* highest-numbered descriptor */
fd_set allsock;
int options;
@ -359,7 +359,7 @@ main(int argc, char **argv)
options |= SO_DEBUG;
break;
case 'l':
log = 1;
dolog = 1;
break;
case 'R':
getvalue(optarg, &toomany,
@ -647,7 +647,7 @@ main(int argc, char **argv)
}
} else
ctrl = sep->se_fd;
if (log && !ISWRAP(sep)) {
if (dolog && !ISWRAP(sep)) {
char pname[INET6_ADDRSTRLEN] = "unknown";
socklen_t sl;
sl = sizeof peermax;
@ -766,7 +766,7 @@ main(int argc, char **argv)
_exit(0);
}
}
if (log) {
if (dolog) {
syslog(allow_severity,
"connection from %.500s, service %s (%s%s)",
eval_client(&req), service, sep->se_proto,