ITS#5379

diff --git a/CHANGES b/CHANGES
index 3f127bffba412251ff25c7c7d41933d67e72013d..f1c169e1afa037667a1b18c3f08532be8d162a59 100644 (file)
--- 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 b94c02f97c7a810344fbcc8e1222f4d1a084ab88..f2b624fb4e7ccdb95044ddc92e74a9d80b875299 100644 (file)
--- 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;
 }