From a49392981ae46def75d737d9d3100e12b41d5ada Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 31 Aug 2001 16:48:30 +0000 Subject: [PATCH] There is no TLSProtocol option. --- include/ldap.h | 4 ++-- servers/slapd/config.c | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/include/ldap.h b/include/ldap.h index ebe247420e..60ef822331 100644 --- a/include/ldap.h +++ b/include/ldap.h @@ -120,7 +120,7 @@ LDAP_BEGIN_DECL #define LDAP_OPT_X_TLS_CERTFILE 0x6004 #define LDAP_OPT_X_TLS_KEYFILE 0x6005 #define LDAP_OPT_X_TLS_REQUIRE_CERT 0x6006 -#define LDAP_OPT_X_TLS_PROTOCOL 0x6007 +/* #define LDAP_OPT_X_TLS_PROTOCOL 0x6007 */ #define LDAP_OPT_X_TLS_CIPHER_SUITE 0x6008 #define LDAP_OPT_X_TLS_RANDOM_FILE 0x6009 @@ -295,7 +295,7 @@ typedef struct ldapcontrol { /* authentication methods available */ #define LDAP_AUTH_NONE ((ber_tag_t) 0x00U) /* no authentication */ #define LDAP_AUTH_SIMPLE ((ber_tag_t) 0x80U) /* context specific + primitive */ -#define LDAP_AUTH_SASL ((ber_tag_t) 0xa3U) /* context specific + primitive */ +#define LDAP_AUTH_SASL ((ber_tag_t) 0xa3U) /* context specific + constructed */ #define LDAP_AUTH_KRBV4 ((ber_tag_t) 0xffU) /* means do both of the following */ #define LDAP_AUTH_KRBV41 ((ber_tag_t) 0x81U) /* context specific + primitive */ #define LDAP_AUTH_KRBV42 ((ber_tag_t) 0x82U) /* context specific + primitive */ diff --git a/servers/slapd/config.c b/servers/slapd/config.c index 25fe612b5d..f20979649e 100644 --- a/servers/slapd/config.c +++ b/servers/slapd/config.c @@ -1991,13 +1991,6 @@ read_config( const char *fname ) #endif /*SLAPD_MODULES*/ #ifdef HAVE_TLS - } else if ( !strcasecmp( cargv[0], "TLSProtocol" ) ) { - rc = ldap_pvt_tls_set_option( NULL, - LDAP_OPT_X_TLS_PROTOCOL, - cargv[1] ); - if ( rc ) - return rc; - } else if ( !strcasecmp( cargv[0], "TLSRandFile" ) ) { rc = ldap_pvt_tls_set_option( NULL, LDAP_OPT_X_TLS_RANDOM_FILE,