From: Howard Chu Date: Mon, 7 Dec 2009 20:06:54 +0000 (+0000) Subject: ITS#6419 starttls keyword should trigger bindconf TLS settings X-Git-Tag: ACLCHECK_0~21 X-Git-Url: https://git.sur5r.net/?p=openldap;a=commitdiff_plain;h=dba33ec04cbca6754bda7fdd7ca9ad95b0f92250 ITS#6419 starttls keyword should trigger bindconf TLS settings --- diff --git a/servers/slapd/config.c b/servers/slapd/config.c index 7f91d5ec87..8e812f5ee3 100644 --- a/servers/slapd/config.c +++ b/servers/slapd/config.c @@ -1308,12 +1308,11 @@ static slap_cf_aux_table bindkey[] = { { BER_BVC("authzID="), offsetof(slap_bindconf, sb_authzId), 'b', 1, (slap_verbmasks *)authzNormalize }, { BER_BVC("keepalive="), offsetof(slap_bindconf, sb_keepalive), 'x', 0, (slap_verbmasks *)slap_keepalive_parse }, #ifdef HAVE_TLS - { BER_BVC("starttls="), offsetof(slap_bindconf, sb_tls), 'i', 0, tlskey }, - - /* NOTE: replace "14" with the actual index + /* NOTE: replace "13" with the actual index * of the first TLS-related line */ -#define aux_TLS (bindkey+14) /* beginning of TLS keywords */ +#define aux_TLS (bindkey+13) /* beginning of TLS keywords */ + { BER_BVC("starttls="), offsetof(slap_bindconf, sb_tls), 'i', 0, tlskey }, { BER_BVC("tls_cert="), offsetof(slap_bindconf, sb_tls_cert), 's', 1, NULL }, { BER_BVC("tls_key="), offsetof(slap_bindconf, sb_tls_key), 's', 1, NULL }, { BER_BVC("tls_cacert="), offsetof(slap_bindconf, sb_tls_cacert), 's', 1, NULL },