From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 2 Mar 2021 21:03:40 +0000 (+0000)
Subject: ITS#9481 - Fix cases when IPv6 support is disabled
X-Git-Tag: OPENLDAP_REL_ENG_2_5_3BETA~6^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=891fc1e11795ac35a2ace16127979351bacf786b;p=thirdparty%2Fopenldap.git

ITS#9481 - Fix cases when IPv6 support is disabled
---

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 22f117696f..8af74e8043 100644
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -310,7 +310,9 @@ usage( char *name )
 		"usage: %s options\n", name );
 	fprintf( stderr,
 		"\t-4\t\tIPv4 only\n"
+#ifdef LDAP_PF_INET6
 		"\t-6\t\tIPv6 only\n"
+#endif
 		"\t-T {acl|add|auth|cat|dn|index|modify|passwd|test}\n"
 		"\t\t\tRun in Tool mode\n"
 		"\t-c cookie\tSync cookie of consumer\n"
@@ -483,10 +485,10 @@ int main( int argc, char **argv )
 #endif
 			     )) != EOF ) {
 		switch ( i ) {
-#ifdef LDAP_PF_INET6
 		case '4':
 			slap_inet4or6 = AF_INET;
 			break;
+#ifdef LDAP_PF_INET6
 		case '6':
 			slap_inet4or6 = AF_INET6;
 			break;
diff --git a/servers/slapd/proxyp.c b/servers/slapd/proxyp.c
index 8c28abe19f..e0342e802b 100644
--- a/servers/slapd/proxyp.c
+++ b/servers/slapd/proxyp.c
@@ -172,7 +172,7 @@ proxyp( ber_socket_t sfd, Sockaddr *from ) {
 			from->sa_in6_addr.sin6_port = ppa.ip6.src_port;
 #else
 			Debug( LDAP_DEBUG_ANY, "proxyp(%ld): "
-					"IPv6 proxied addresses disabled, \n",
+					"IPv6 proxied addresses disabled\n",
 					(long)sfd );
 			return 0;
 #endif
diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 2a52fe74a6..40e6aa6f98 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -372,9 +372,7 @@ typedef struct Operation Operation;
 typedef struct SlapReply SlapReply;
 /* end of forward declarations */
 
-#ifdef LDAP_PF_INET6
 extern int slap_inet4or6;
-#endif
 
 struct OidMacro {
 	struct berval som_oid;