upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-19 13:23:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#4580 make sure port number is preserved in replica info

Browse source
This commit is contained in:
Howard Chu 2006-06-08 11:37:14 +00:00
parent 5466628e81
commit f15e31b9a9
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
servers/slapd/bconfig.c
View file

@ -2616,6 +2616,8 @@ config_replica(ConfigArgs *c) {
nr = add_replica_info(c->be, replicauri, replicahost);
break;
} else if(!strncasecmp(c->argv[i], "uri=", STRLENOF("uri="))) {
ber_len_t len;
if ( replicauri ) {
snprintf( c->msg, sizeof( c->msg ), "<%s> replica host/URI already specified", c->argv[0] );
Debug(LDAP_DEBUG_ANY, "%s: %s \"%s\"\n", c->log, c->msg, replicauri );
@ -2634,11 +2636,27 @@ config_replica(ConfigArgs *c) {
Debug(LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->msg, 0 );
return(1);
}
len = strlen(ludp->lud_scheme) + strlen(ludp->lud_host) +
STRLENOF("://") + 1;
if (ludp->lud_port != LDAP_PORT) {
if (ludp->lud_port < 1 || ludp->lud_port > 65535) {
snprintf( c->msg, sizeof( c->msg ), "<%s> invalid port",
c->argv[0] );
Debug(LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->msg, 0 );
return(1);
}
len += STRLENOF(":65535");
}
replicauri = ch_malloc( len );
replicahost = lutil_strcopy( replicauri, ludp->lud_scheme );
replicahost = lutil_strcopy( replicauri, "://" );
if (ludp->lud_port == LDAP_PORT) {
strcpy( replicahost, ludp->lud_host );
} else {
sprintf( replicahost, "%s:%d",ludp->lud_host,ludp->lud_port );
}
ldap_free_urldesc(ludp);
replicauri = c->argv[i] + STRLENOF("uri=");
replicauri = ch_strdup( replicauri );
replicahost = strchr( replicauri, '/' );
replicahost += 2;
nr = add_replica_info(c->be, replicauri, replicahost);
break;
}