aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2003-10-30 22:56:44 +0000
committerPeter Wemm <peter@FreeBSD.org>2003-10-30 22:56:44 +0000
commite2c617744fc6658b8992eaa25ba6cafff41e46a6 (patch)
treecaf70bd85b43b7b2e6df5ad5de42ffef3bb8e780 /usr.sbin
parent457fc53d28b0a83aabe5c83ed51ae3e2af908a00 (diff)
Notes
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/inetd/Makefile1
-rw-r--r--usr.sbin/inetd/inetd.c8
2 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile
index e2221288255a5..afe4c51135808 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 25792836c2461..b590a3bfcd2d2 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,