diff options
| author | ngie <ngie@FreeBSD.org> | 2017-02-04 15:52:08 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-02-04 15:52:08 +0000 |
| commit | 386063275561117fce31f6f3c6885555c567949e (patch) | |
| tree | 6f1bb55dbb6a32746aa297421306b0019c5d8923 /usr.sbin | |
| parent | 75f9b073cb56727e69db95f16adf961ad6435eda (diff) | |
| download | FreeBSD-src-386063275561117fce31f6f3c6885555c567949e.zip FreeBSD-src-386063275561117fce31f6f3c6885555c567949e.tar.gz | |
MFC r312105,r312162:
r312105:
Conditionalize libwrap support into inetd based on MK_TCP_WRAPPERS
This will allow inetd to stand by itself without libwrap.
Relnotes: yes
r312162:
Fix up r312105
- Only #include tcpd.h when LIBWRAP is true to avoid header include errors
- Only define whichaf when LIBWRAP is true to avoid -Wunused warning and
to avoid issues with structs being defined that should only be defined
when tcpd.h is included.
Pointyhat to: ngie
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/inetd/Makefile | 10 | ||||
| -rw-r--r-- | usr.sbin/inetd/inetd.c | 8 |
2 files changed, 16 insertions, 2 deletions
diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile index 29aacd1..043dd68 100644 --- a/usr.sbin/inetd/Makefile +++ b/usr.sbin/inetd/Makefile @@ -16,8 +16,14 @@ CFLAGS+= -DLOGIN_CAP CFLAGS+= -DINET6 .endif -DPADD= ${LIBUTIL} ${LIBWRAP} -LDADD= -lutil -lwrap +DPADD+= ${LIBUTIL} +LDADD+= -lutil + +.if ${MK_TCP_WRAPPERS} != "no" +CFLAGS+= -DLIBWRAP +DPADD+= ${LIBWRAP} +LDADD+= -lwrap +.endif # XXX for src/release/picobsd .if !defined(RELEASE_CRUNCH) diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c index 5437ae1..56710b5b 100644 --- a/usr.sbin/inetd/inetd.c +++ b/usr.sbin/inetd/inetd.c @@ -138,7 +138,9 @@ __FBSDID("$FreeBSD$"); #include <string.h> #include <sysexits.h> #include <syslog.h> +#ifdef LIBWRAP #include <tcpd.h> +#endif #include <unistd.h> #include "inetd.h" @@ -297,6 +299,7 @@ getvalue(const char *arg, int *value, const char *whine) return 0; /* success */ } +#ifdef LIBWRAP static sa_family_t whichaf(struct request_info *req) { @@ -310,6 +313,7 @@ whichaf(struct request_info *req) return AF_INET; return sa->sa_family; } +#endif int main(int argc, char **argv) @@ -324,9 +328,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; @@ -736,6 +742,7 @@ main(int argc, char **argv) _exit(0); } } +#ifdef LIBWRAP if (ISWRAP(sep)) { inetd_setproctitle("wrapping", ctrl); service = sep->se_server_name ? @@ -764,6 +771,7 @@ main(int argc, char **argv) (whichaf(&req) == AF_INET6) ? "6" : ""); } } +#endif if (sep->se_bi) { (*sep->se_bi->bi_fn)(ctrl, sep); } else { |
