diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2017-01-14 10:20:38 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2017-01-14 10:20:38 +0000 |
| commit | 484b7007513543f58241aae6542ad1ea3d016871 (patch) | |
| tree | 7f9e4cf13aee0d0ef26a5ce95b178ca0b97ceba1 /usr.sbin/inetd | |
| parent | 28699efd430e6904192f42882c42adb878087f8a (diff) | |
| download | src-484b7007513543f58241aae6542ad1ea3d016871.tar.gz src-484b7007513543f58241aae6542ad1ea3d016871.zip | |
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.
MFC after: 2 weeks
X-MFC with: r312105
Pointyhat to: ngie
Reported by: gcc tinderbox
Sponsored by: Dell EMC Isilon
Notes
Notes:
svn path=/head/; revision=312162
Diffstat (limited to 'usr.sbin/inetd')
| -rw-r--r-- | usr.sbin/inetd/inetd.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c index e538b871172a..e073f8f9c0ac 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" @@ -307,6 +309,7 @@ getvalue(const char *arg, int *value, const char *whine) return 0; /* success */ } +#ifdef LIBWRAP static sa_family_t whichaf(struct request_info *req) { @@ -322,6 +325,7 @@ whichaf(struct request_info *req) #endif return sa->sa_family; } +#endif int main(int argc, char **argv) |