We should stop using SSL to refer to TLS. This is a first step.

This commit is contained in:
Julio Sánchez Fernández 1999-07-16 10:28:51 +00:00
parent afa4fde7c4
commit fd8b582aa9

View file

@ -588,42 +588,42 @@ read_config( char *fname )
#endif /*SLAPD_MODULES*/ #endif /*SLAPD_MODULES*/
#ifdef HAVE_TLS #ifdef HAVE_TLS
} else if ( !strcasecmp( cargv[0], "SSLProtocol" ) ) { } else if ( !strcasecmp( cargv[0], "TLSProtocol" ) ) {
rc = ldap_pvt_tls_set_option( NULL, rc = ldap_pvt_tls_set_option( NULL,
LDAP_OPT_X_TLS_PROTOCOL, LDAP_OPT_X_TLS_PROTOCOL,
cargv[1] ); cargv[1] );
if ( rc ) if ( rc )
return rc; return rc;
} else if ( !strcasecmp( cargv[0], "SSLCipherSuite" ) ) { } else if ( !strcasecmp( cargv[0], "TLSCipherSuite" ) ) {
rc = ldap_pvt_tls_set_option( NULL, rc = ldap_pvt_tls_set_option( NULL,
LDAP_OPT_X_TLS_CIPHER_SUITE, LDAP_OPT_X_TLS_CIPHER_SUITE,
cargv[1] ); cargv[1] );
if ( rc ) if ( rc )
return rc; return rc;
} else if ( !strcasecmp( cargv[0], "SSLCertificateFile" ) ) { } else if ( !strcasecmp( cargv[0], "TLSCertificateFile" ) ) {
rc = ldap_pvt_tls_set_option( NULL, rc = ldap_pvt_tls_set_option( NULL,
LDAP_OPT_X_TLS_CERTFILE, LDAP_OPT_X_TLS_CERTFILE,
cargv[1] ); cargv[1] );
if ( rc ) if ( rc )
return rc; return rc;
} else if ( !strcasecmp( cargv[0], "SSLCertificateKeyFile" ) ) { } else if ( !strcasecmp( cargv[0], "TLSCertificateKeyFile" ) ) {
rc = ldap_pvt_tls_set_option( NULL, rc = ldap_pvt_tls_set_option( NULL,
LDAP_OPT_X_TLS_KEYFILE, LDAP_OPT_X_TLS_KEYFILE,
cargv[1] ); cargv[1] );
if ( rc ) if ( rc )
return rc; return rc;
} else if ( !strcasecmp( cargv[0], "SSLCACertificatePath" ) ) { } else if ( !strcasecmp( cargv[0], "TLSCACertificatePath" ) ) {
rc = ldap_pvt_tls_set_option( NULL, rc = ldap_pvt_tls_set_option( NULL,
LDAP_OPT_X_TLS_CACERTDIR, LDAP_OPT_X_TLS_CACERTDIR,
cargv[1] ); cargv[1] );
if ( rc ) if ( rc )
return rc; return rc;
} else if ( !strcasecmp( cargv[0], "SSLCACertificateFile" ) ) { } else if ( !strcasecmp( cargv[0], "TLSCACertificateFile" ) ) {
rc = ldap_pvt_tls_set_option( NULL, rc = ldap_pvt_tls_set_option( NULL,
LDAP_OPT_X_TLS_CACERTFILE, LDAP_OPT_X_TLS_CACERTFILE,
cargv[1] ); cargv[1] );