diff options
| author | peter <peter@FreeBSD.org> | 2003-10-30 22:56:44 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2003-10-30 22:56:44 +0000 |
| commit | 282762c918785ab291ecd9cb1b1d26f1d9200101 (patch) | |
| tree | caf70bd85b43b7b2e6df5ad5de42ffef3bb8e780 | |
| parent | e6809a8b876002cd81a771faaf6d9b2cc8c864f7 (diff) | |
| download | FreeBSD-src-282762c918785ab291ecd9cb1b1d26f1d9200101.zip FreeBSD-src-282762c918785ab291ecd9cb1b1d26f1d9200101.tar.gz | |
Rather than use the gcc -fno-builtin-log flag, just rename the 'int log'
variable.
| -rw-r--r-- | usr.sbin/inetd/Makefile | 1 | ||||
| -rw-r--r-- | usr.sbin/inetd/inetd.c | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile index e222128..afe4c51 100644 --- a/usr.sbin/inetd/Makefile +++ b/usr.sbin/inetd/Makefile @@ -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 diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c index 2579283..b590a3b 100644 --- a/usr.sbin/inetd/inetd.c +++ b/usr.sbin/inetd/inetd.c @@ -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, |
