summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshin <shin@FreeBSD.org>2000-03-11 11:28:08 +0000
committershin <shin@FreeBSD.org>2000-03-11 11:28:08 +0000
commit304da3fbf23470681cf2fe6d5287aa6a8693ada6 (patch)
tree9cee17796ae138683f745e13bcae19da250bc20a
parent45b25e45865fe62c14572c2384591b21f915a426 (diff)
downloadFreeBSD-src-304da3fbf23470681cf2fe6d5287aa6a8693ada6.zip
FreeBSD-src-304da3fbf23470681cf2fe6d5287aa6a8693ada6.tar.gz
Make inetd compilable without INET6.
Approved by: jkh Submitted by: jhb
-rw-r--r--usr.sbin/inetd/builtins.c2
-rw-r--r--usr.sbin/inetd/inetd.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/inetd/builtins.c b/usr.sbin/inetd/builtins.c
index 30cde03..b49ecba 100644
--- a/usr.sbin/inetd/builtins.c
+++ b/usr.sbin/inetd/builtins.c
@@ -335,7 +335,9 @@ ident_stream(s, sep) /* Ident service (AKA "auth") */
struct utsname un;
struct stat sb;
struct sockaddr_in sin[2];
+#ifdef INET6
struct sockaddr_in6 sin6[2];
+#endif
struct sockaddr_storage ss[2];
struct ucred uc;
struct timeval tv = {
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index 6cd207a..a17c4e8 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -1589,9 +1589,9 @@ more:
sep->se_family = AF_INET6;
if (v4bind == 0 || no_v4bind != 0)
sep->se_nomapped = 1;
- }
+ } else
#endif
- else { /* default to v4 bind if not v6 bind */
+ { /* default to v4 bind if not v6 bind */
if (no_v4bind != 0) {
syslog(LOG_INFO, "IPv4 bind is ignored for %s",
sep->se_service);
OpenPOWER on IntegriCloud