From a908d75f0cee37272237eb9d7041c2e12fa8306e Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Tue, 10 Jun 2003 18:33:44 +0000 Subject: [PATCH] s/tls/starttls/ s/master/provider/ --- servers/slapd/config.c | 14 ++++++++------ servers/slapd/slap.h | 8 ++++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/servers/slapd/config.c b/servers/slapd/config.c index e3b04a9023..1efb7070b5 100644 --- a/servers/slapd/config.c +++ b/servers/slapd/config.c @@ -2748,9 +2748,9 @@ parse_syncrepl_line( val = cargv[ i ] + sizeof( IDSTR ); si->id = atoi( val ); gots |= GOT_ID; - } else if ( !strncasecmp( cargv[ i ], MASTERSTR, - sizeof( MASTERSTR ) - 1 )) { - val = cargv[ i ] + sizeof( MASTERSTR ); + } else if ( !strncasecmp( cargv[ i ], PROVIDERSTR, + sizeof( PROVIDERSTR ) - 1 )) { + val = cargv[ i ] + sizeof( PROVIDERSTR ); si->masteruri = ch_strdup( val ); if (( hp = strchr( val, ':' )) != NULL ) { if ( *( hp + 1 ) == '/' ) { @@ -2778,9 +2778,11 @@ parse_syncrepl_line( si->master_bv[1].bv_len = 0; si->master_bv[1].bv_val = NULL; gots |= GOT_HOST; - } else if ( !strncasecmp( cargv[ i ], TLSSTR, sizeof( TLSSTR ) - 1 ) ) { - val = cargv[ i ] + sizeof( TLSSTR ); - if( !strcasecmp( val, TLSCRITICALSTR ) ) { + } else if ( !strncasecmp( cargv[ i ], STARTTLSSTR, + sizeof(STARTTLSSTR) - 1 ) ) + { + val = cargv[ i ] + sizeof( STARTTLSSTR ); + if( !strcasecmp( val, CRITICALSTR ) ) { si->tls = TLS_CRITICAL; } else { si->tls = TLS_ON; diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index e931a7d800..5bf92657e9 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -302,7 +302,7 @@ typedef struct slap_syntax { LDAPSyntax ssyn_syn; #define ssyn_oid ssyn_syn.syn_oid #define ssyn_desc ssyn_syn.syn_desc -#define ssyn_extensions ssyn_syn.syn_extensions +#define ssyn_extensions ssyn_syn.syn_extensions /* * Note: the former ber_len_t ssyn_oidlen; @@ -1341,7 +1341,7 @@ typedef struct syncinfo_s { } syncinfo_t; #define IDSTR "id" -#define MASTERSTR "master" +#define PROVIDERSTR "provider" #define SUFFIXSTR "suffix" #define UPDATEDNSTR "updatedn" #define BINDDNSTR "binddn" @@ -1356,8 +1356,8 @@ typedef struct syncinfo_s { #define SASLMECHSTR "saslmech" #define REALMSTR "realm" #define SECPROPSSTR "secprops" -#define TLSSTR "tls" -#define TLSCRITICALSTR "critical" +#define STARTTLSSTR "starttls" +#define CRITICALSTR "critical" #define FILTERSTR "filter" #define SEARCHBASESTR "searchbase" -- 2.39.5