Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the previous dependent on LIBWRAP_INTERNAL, which is not defined by 

default.
This commit is contained in:
mycroft 1997-03-13 18:36:35 +00:00
parent f919d5c499
commit 51fa5e9be7
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/inetd/Makefile
View File

@ -1,11 +1,13 @@
# from: @(#)Makefile 5.5 (Berkeley) 6/29/90
# $NetBSD: Makefile,v 1.9 1997/01/12 06:55:41 mikel Exp $
# $NetBSD: Makefile,v 1.10 1997/03/13 18:36:35 mycroft Exp $
PROG= inetd
MAN= inetd.8
MLINKS= inetd.8 inetd.conf.5
CFLAGS+=-DLIBWRAP
# Use LIBWRAP_INTERNAL for libwrap checking of inetd's `internal' services.
#CFLAGS+=-DLIBWRAP_INTERNAL
LDADD+= -lwrap
DPADD+= ${LIBWRAP}

11
usr.sbin/inetd/inetd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: inetd.c,v 1.27 1997/03/13 18:19:35 mycroft Exp $ */
/* $NetBSD: inetd.c,v 1.28 1997/03/13 18:36:37 mycroft Exp $ */
/*
* Copyright (c) 1983, 1991, 1993, 1994
@ -43,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)inetd.c 8.4 (Berkeley) 4/13/94";
#else
static char rcsid[] = "$NetBSD: inetd.c,v 1.27 1997/03/13 18:19:35 mycroft Exp $";
static char rcsid[] = "$NetBSD: inetd.c,v 1.28 1997/03/13 18:36:37 mycroft Exp $";
#endif
#endif /* not lint */
@ -503,7 +503,7 @@ main(argc, argv, envp)
ctrl = sep->se_fd;
(void) sigblock(SIGBLOCK);
pid = 0;
#ifdef LIBWRAP
#ifdef LIBWRAP_INTERNAL
dofork = 1;
#else
dofork = (sep->se_bi == 0 || sep->se_bi->bi_fork);
@ -553,6 +553,10 @@ main(argc, argv, envp)
sigsetmask(0L);
if (pid == 0) {
#ifdef LIBWRAP
#ifndef LIBWRAP_INTERNAL
if (sep->se_bi != 0)
#endif
{
request_init(&req, RQ_DAEMON, sep->se_argv[0] ?
sep->se_argv[0] : sep->se_service, RQ_FILE, ctrl,
NULL);
@ -579,6 +583,7 @@ main(argc, argv, envp)
"connection from %.500s, service %s (%s)",
eval_client(&req), service, sep->se_proto);
}
}
#endif /* LIBWRAP */
if (sep->se_bi) {
(*sep->se_bi->bi_fn)(ctrl, sep);