mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-06 10:46:21 +08:00
TLS config statements always need an argument (related to ITS#7012)
This commit is contained in:
parent
a31a8ed20e
commit
55c70629aa
@ -676,7 +676,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
|
||||
@ -684,7 +684,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
|
||||
@ -692,7 +692,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
|
||||
@ -700,7 +700,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
|
||||
@ -708,7 +708,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
|
||||
@ -716,7 +716,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
|
||||
@ -724,7 +724,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
|
||||
@ -732,7 +732,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
|
||||
@ -740,7 +740,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
|
||||
@ -748,7 +748,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
|
||||
@ -756,7 +756,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
|
||||
|
Loading…
Reference in New Issue
Block a user