Commit 19fa80f6 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5379

parent 1b540af9
...@@ -28,6 +28,7 @@ OpenLDAP 2.4.8 Engineering ...@@ -28,6 +28,7 @@ OpenLDAP 2.4.8 Engineering
Fixed slapd sasl with CLEARTEXT (ITS#5368) Fixed slapd sasl with CLEARTEXT (ITS#5368)
Fixed slapd str2entry with no attrs (ITS#5308) Fixed slapd str2entry with no attrs (ITS#5308)
Fixed slapd TLSVerifyClient default (ITS#5360) Fixed slapd TLSVerifyClient default (ITS#5360)
Fixed slapd HAVE_TLS dependency (ITS#5379)
Fixed slapd delta-syncrepl refresh mode (ITS#5376) Fixed slapd delta-syncrepl refresh mode (ITS#5376)
Fixed slapd-bdb idlcache on adds (ITS#5086) Fixed slapd-bdb idlcache on adds (ITS#5086)
Fixed slapd-bdb crash with modrdn (ITS#5358) Fixed slapd-bdb crash with modrdn (ITS#5358)
......
...@@ -1402,19 +1402,18 @@ slap_cf_aux_table_unparse( void *src, struct berval *bv, slap_cf_aux_table *tab0 ...@@ -1402,19 +1402,18 @@ slap_cf_aux_table_unparse( void *src, struct berval *bv, slap_cf_aux_table *tab0
int int
slap_tls_get_config( LDAP *ld, int opt, char **val ) slap_tls_get_config( LDAP *ld, int opt, char **val )
{ {
#ifdef HAVE_TLS
slap_verbmasks *keys; slap_verbmasks *keys;
int i, ival; int i, ival;
*val = NULL; *val = NULL;
switch( opt ) { switch( opt ) {
#ifdef HAVE_TLS
case LDAP_OPT_X_TLS_CRLCHECK: case LDAP_OPT_X_TLS_CRLCHECK:
keys = crlkeys; keys = crlkeys;
break; break;
case LDAP_OPT_X_TLS_REQUIRE_CERT: case LDAP_OPT_X_TLS_REQUIRE_CERT:
keys = vfykeys; keys = vfykeys;
break; break;
#endif
default: default:
return -1; return -1;
} }
...@@ -1425,6 +1424,7 @@ slap_tls_get_config( LDAP *ld, int opt, char **val ) ...@@ -1425,6 +1424,7 @@ slap_tls_get_config( LDAP *ld, int opt, char **val )
return 0; return 0;
} }
} }
#endif
return -1; return -1;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment