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

ITS#7200 enforce check for matching serverID URL

Browse Source
This commit is contained in:
Howard Chu 2012-03-08 19:24:09 -08:00
parent 3743a5a68e
commit b4d403ea31
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
servers/slapd/bconfig.c
View File

@ -911,6 +911,7 @@ typedef struct ServerID {
} ServerID;
static ServerID *sid_list;
static int sid_set;
typedef struct voidList {
struct voidList *vl_next;
@ -2035,6 +2036,7 @@ sortval_reject:
Debug( LDAP_DEBUG_CONFIG,
"%s: SID=0x%03x\n",
c->log, slap_serverID, 0 );
sid_set = 1;
}
si->si_next = NULL;
si->si_num = num;
@ -2044,11 +2046,20 @@ sortval_reject:
if (( slapMode & SLAP_SERVER_MODE ) && c->argc > 2 ) {
Listener *l = config_check_my_url( c->argv[2], lud );
if ( l ) {
if ( sid_set ) {
ldap_free_urldesc( lud );
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"<%s> multiple server ID URLs matched, only one is allowed", c->argv[0] );
Debug(LDAP_DEBUG_ANY, "%s: %s %s\n",
c->log, c->cr_msg, c->argv[1] );
return 1;
}
slap_serverID = si->si_num;
Debug( LDAP_DEBUG_CONFIG,
"%s: SID=0x%03x (listener=%s)\n",
c->log, slap_serverID,
l->sl_url.bv_val );
sid_set = 1;
}
}
if ( c->argc > 2 )
@ -4360,6 +4371,13 @@ done:
assert( 0 );
}
}
if ( rc == 0 && ( slapMode & SLAP_SERVER_MODE ) && sid_list ) {
if ( !BER_BVISEMPTY( &sid_list->si_url ) && !sid_set ) {
Debug(LDAP_DEBUG_ANY, "read_config: no serverID / URL match found. "
"Check slapd -h arguments.\n", 0,0,0 );
rc = LDAP_OTHER;
}
}
return rc;
}