From: Pierangelo Masarati Date: Wed, 10 Aug 2011 17:40:20 +0000 (+0200) Subject: TLS config statements always need an argument (related to ITS#7012) X-Git-Tag: OPENLDAP_REL_ENG_2_4_27~305 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=06ebd8dd402d83428311bcc7f6c0871407858c2d;p=openldap TLS config statements always need an argument (related to ITS#7012) --- diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c index 3a30d1471d..cb4d897a85 100644 --- a/servers/slapd/bconfig.c +++ b/servers/slapd/bconfig.c @@ -653,7 +653,7 @@ static ConfigTable config_back_cf_table[] = { { "timelimit", "limit", 2, 0, 0, ARG_MAY_DB|ARG_MAGIC, &config_timelimit, "( OLcfgGlAt:67 NAME 'olcTimeLimit' " "SYNTAX OMsDirectoryString )", NULL, NULL }, - { "TLSCACertificateFile", NULL, 0, 0, 0, + { "TLSCACertificateFile", NULL, 2, 2, 0, #ifdef HAVE_TLS CFG_TLS_CA_FILE|ARG_STRING|ARG_MAGIC, &config_tls_option, #else @@ -661,7 +661,7 @@ static ConfigTable config_back_cf_table[] = { #endif "( OLcfgGlAt:68 NAME 'olcTLSCACertificateFile' " "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL }, - { "TLSCACertificatePath", NULL, 0, 0, 0, + { "TLSCACertificatePath", NULL, 2, 2, 0, #ifdef HAVE_TLS CFG_TLS_CA_PATH|ARG_STRING|ARG_MAGIC, &config_tls_option, #else @@ -669,7 +669,7 @@ static ConfigTable config_back_cf_table[] = { #endif "( OLcfgGlAt:69 NAME 'olcTLSCACertificatePath' " "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL }, - { "TLSCertificateFile", NULL, 0, 0, 0, + { "TLSCertificateFile", NULL, 2, 2, 0, #ifdef HAVE_TLS CFG_TLS_CERT_FILE|ARG_STRING|ARG_MAGIC, &config_tls_option, #else @@ -677,7 +677,7 @@ static ConfigTable config_back_cf_table[] = { #endif "( OLcfgGlAt:70 NAME 'olcTLSCertificateFile' " "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL }, - { "TLSCertificateKeyFile", NULL, 0, 0, 0, + { "TLSCertificateKeyFile", NULL, 2, 2, 0, #ifdef HAVE_TLS CFG_TLS_CERT_KEY|ARG_STRING|ARG_MAGIC, &config_tls_option, #else @@ -685,7 +685,7 @@ static ConfigTable config_back_cf_table[] = { #endif "( OLcfgGlAt:71 NAME 'olcTLSCertificateKeyFile' " "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL }, - { "TLSCipherSuite", NULL, 0, 0, 0, + { "TLSCipherSuite", NULL, 2, 2, 0, #ifdef HAVE_TLS CFG_TLS_CIPHER|ARG_STRING|ARG_MAGIC, &config_tls_option, #else @@ -693,7 +693,7 @@ static ConfigTable config_back_cf_table[] = { #endif "( OLcfgGlAt:72 NAME 'olcTLSCipherSuite' " "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL }, - { "TLSCRLCheck", NULL, 0, 0, 0, + { "TLSCRLCheck", NULL, 2, 2, 0, #if defined(HAVE_TLS) && defined(HAVE_OPENSSL_CRL) CFG_TLS_CRLCHECK|ARG_STRING|ARG_MAGIC, &config_tls_config, #else @@ -701,7 +701,7 @@ static ConfigTable config_back_cf_table[] = { #endif "( OLcfgGlAt:73 NAME 'olcTLSCRLCheck' " "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL }, - { "TLSCRLFile", NULL, 0, 0, 0, + { "TLSCRLFile", NULL, 2, 2, 0, #if defined(HAVE_GNUTLS) CFG_TLS_CRL_FILE|ARG_STRING|ARG_MAGIC, &config_tls_option, #else @@ -709,7 +709,7 @@ static ConfigTable config_back_cf_table[] = { #endif "( OLcfgGlAt:82 NAME 'olcTLSCRLFile' " "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL }, - { "TLSRandFile", NULL, 0, 0, 0, + { "TLSRandFile", NULL, 2, 2, 0, #ifdef HAVE_TLS CFG_TLS_RAND|ARG_STRING|ARG_MAGIC, &config_tls_option, #else @@ -717,7 +717,7 @@ static ConfigTable config_back_cf_table[] = { #endif "( OLcfgGlAt:74 NAME 'olcTLSRandFile' " "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL }, - { "TLSVerifyClient", NULL, 0, 0, 0, + { "TLSVerifyClient", NULL, 2, 2, 0, #ifdef HAVE_TLS CFG_TLS_VERIFY|ARG_STRING|ARG_MAGIC, &config_tls_config, #else @@ -725,7 +725,7 @@ static ConfigTable config_back_cf_table[] = { #endif "( OLcfgGlAt:75 NAME 'olcTLSVerifyClient' " "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL }, - { "TLSDHParamFile", NULL, 0, 0, 0, + { "TLSDHParamFile", NULL, 2, 2, 0, #ifdef HAVE_TLS CFG_TLS_DH_FILE|ARG_STRING|ARG_MAGIC, &config_tls_option, #else @@ -733,7 +733,7 @@ static ConfigTable config_back_cf_table[] = { #endif "( OLcfgGlAt:77 NAME 'olcTLSDHParamFile' " "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL }, - { "TLSProtocolMin", NULL, 0, 0, 0, + { "TLSProtocolMin", NULL, 2, 2, 0, #ifdef HAVE_TLS CFG_TLS_PROTOCOL_MIN|ARG_STRING|ARG_MAGIC, &config_tls_config, #else