From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 14 Feb 2008 17:48:16 +0000 (+0000)
Subject: ITS#5379
X-Git-Tag: OPENLDAP_REL_ENG_2_4_8~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=19fa80f6cd6b2d01eafcffae462eb1200aa70d36;p=openldap

ITS#5379
---

diff --git a/CHANGES b/CHANGES
index 3f127bffba..f1c169e1af 100644
--- a/CHANGES
+++ b/CHANGES
@@ -28,6 +28,7 @@ OpenLDAP 2.4.8 Engineering
 	Fixed slapd sasl with CLEARTEXT (ITS#5368)
 	Fixed slapd str2entry with no attrs (ITS#5308)
 	Fixed slapd TLSVerifyClient default (ITS#5360)
+	Fixed slapd HAVE_TLS dependency (ITS#5379)
 	Fixed slapd delta-syncrepl refresh mode (ITS#5376)
 	Fixed slapd-bdb idlcache on adds (ITS#5086)
 	Fixed slapd-bdb crash with modrdn (ITS#5358)
diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index b94c02f97c..f2b624fb4e 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -1402,19 +1402,18 @@ slap_cf_aux_table_unparse( void *src, struct berval *bv, slap_cf_aux_table *tab0
 int
 slap_tls_get_config( LDAP *ld, int opt, char **val )
 {
+#ifdef HAVE_TLS
 	slap_verbmasks *keys;
 	int i, ival;
 
 	*val = NULL;
 	switch( opt ) {
-#ifdef HAVE_TLS
 	case LDAP_OPT_X_TLS_CRLCHECK:
 		keys = crlkeys;
 		break;
 	case LDAP_OPT_X_TLS_REQUIRE_CERT:
 		keys = vfykeys;
 		break;
-#endif
 	default:
 		return -1;
 	}
@@ -1425,6 +1424,7 @@ slap_tls_get_config( LDAP *ld, int opt, char **val )
 			return 0;
 		}
 	}
+#endif
 	return -1;
 }