mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

s/tls/starttls/

Browse Source 
s/master/provider/
This commit is contained in:
Kurt Zeilenga 2003-06-10 18:33:44 +00:00
parent 256732f2ce
commit a908d75f0c
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
servers/slapd/config.c
View File

@ -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;

8
servers/slapd/slap.h
View File

@ -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"