Conditionalize libwrap support into inetd based on MK_TCP_WRAPPERS

This will allow inetd to stand by itself without libwrap.

MFC after:	2 weeks
Relnotes:	yes
Reviewed by:	hrs (earlier version)
Sponsored by:	Dell EMC Isilon
Differential Revision:	https://reviews.freebsd.org/D9056
This commit is contained in:
Enji Cooper 2017-01-14 01:37:03 +00:00
parent 4a6ace7328
commit 63eca8f1dd
2 changed files with 10 additions and 1 deletions

View File

@ -16,7 +16,12 @@ CFLAGS+= -DLOGIN_CAP
CFLAGS+= -DINET6
.endif
LIBADD= util wrap
LIBADD= util
.if ${MK_TCP_WRAPPERS} != "no"
CFLAGS+= -DLIBWRAP
LIBADD+= wrap
.endif
# XXX for src/release/picobsd
.if !defined(RELEASE_CRUNCH)

View File

@ -336,9 +336,11 @@ main(int argc, char **argv)
#ifdef LOGIN_CAP
login_cap_t *lc = NULL;
#endif
#ifdef LIBWRAP
struct request_info req;
int denied;
char *service = NULL;
#endif
struct sockaddr_storage peer;
int i;
struct addrinfo hints, *res;
@ -748,6 +750,7 @@ main(int argc, char **argv)
_exit(0);
}
}
#ifdef LIBWRAP
if (ISWRAP(sep)) {
inetd_setproctitle("wrapping", ctrl);
service = sep->se_server_name ?
@ -776,6 +779,7 @@ main(int argc, char **argv)
(whichaf(&req) == AF_INET6) ? "6" : "");
}
}
#endif
if (sep->se_bi) {
(*sep->se_bi->bi_fn)(ctrl, sep);
} else {