implement "realdn" by clause in ACLs (ITS#3627; accounting for Howard's remarks)

[openldap] / servers / slapd / bconfig.c

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 52b5a9151068465ff0dab516536e473f64de39a5..d3f28a9d663af4f43c42b01b745d9500bd6e0abc 100644 (file)
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -542,7 +542,7 @@ ConfigTable config_back_cf_table[] = {
                "( OLcfgAt:72 NAME 'olcTLSCipherSuite' "
                        "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
        { "TLSCRLCheck", NULL, 0, 0, 0,
-#ifdef HAVE_TLS
+#if defined(HAVE_TLS) && defined(HAVE_OPENSSL_CRL)
                CFG_TLS_CRLCHECK|ARG_STRING|ARG_MAGIC, &config_tls_config,
 #else
                ARG_IGNORED, NULL,
@@ -2040,14 +2040,14 @@ static int
 config_tls_option(ConfigArgs *c) {
        int flag;
        switch(c->type) {
-       case CFG_TLS_RAND:              flag = LDAP_OPT_X_TLS_RANDOM_FILE;      break;
+       case CFG_TLS_RAND:      flag = LDAP_OPT_X_TLS_RANDOM_FILE;      break;
        case CFG_TLS_CIPHER:    flag = LDAP_OPT_X_TLS_CIPHER_SUITE;     break;
        case CFG_TLS_CERT_FILE: flag = LDAP_OPT_X_TLS_CERTFILE;         break;  
        case CFG_TLS_CERT_KEY:  flag = LDAP_OPT_X_TLS_KEYFILE;          break;
        case CFG_TLS_CA_PATH:   flag = LDAP_OPT_X_TLS_CACERTDIR;        break;
        case CFG_TLS_CA_FILE:   flag = LDAP_OPT_X_TLS_CACERTFILE;       break;
        default:                Debug(LDAP_DEBUG_ANY, "%s: "
-                                       "unknown tls_option <%x>\n",
+                                       "unknown tls_option <0x%x>\n",
                                        c->log, c->type, 0);
        }
        if (c->op == SLAP_CONFIG_EMIT) {
@@ -2075,21 +2075,11 @@ config_tls_config(ConfigArgs *c) {
                { BER_BVNULL, 0 }
        }, *keys;
        switch(c->type) {
-       case CFG_TLS_CRLCHECK:
-#ifdef HAVE_OPENSSL_CRL
-               flag = LDAP_OPT_X_TLS_CRLCHECK; keys = crlkeys;
-#else
-               Debug(LDAP_DEBUG_ANY, "%s: "
-                               "disabled tls_option \"TLSCRLCheck\" <%x>\n",
-                               c->log, c->type, 0);
-#endif
-               break;
-       case CFG_TLS_VERIFY:
-               flag = LDAP_OPT_X_TLS_REQUIRE_CERT; keys = vfykeys;
-               break;
+       case CFG_TLS_CRLCHECK:  flag = LDAP_OPT_X_TLS_CRLCHECK;         keys = crlkeys; break;
+       case CFG_TLS_VERIFY:    flag = LDAP_OPT_X_TLS_REQUIRE_CERT;     keys = vfykeys; break;
        default:
                Debug(LDAP_DEBUG_ANY, "%s: "
-                               "unknown tls_option <%x>\n",
+                               "unknown tls_option <0x%x>\n",
                                c->log, c->type, 0);
        }
        if (c->op == SLAP_CONFIG_EMIT) {