Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

558135 - smart referrals with three contiguous slashes don't work

Browse Source 
git-svn-id: svn://10.0.0.236/branches/ldapcsdk_branch_50@103210 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mhein%netscape.com
2001-09-19 18:49:51 +00:00
parent 67eb0cf2bf
commit ea1827f519
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mozilla/directory/c-sdk/ldap/libraries/libldap/request.c
View File

@@ -993,9 +993,18 @@ chase_one_referral( LDAP *ld, LDAPRequest *lr, LDAPRequest *origreq,
srv->lsrv_host = NULL;
} else {
if ( ludp->lud_host == NULL ) {
srv->lsrv_host = nsldapi_strdup( ld->ld_defhost );
srv->lsrv_host =
nsldapi_strdup( origreq->lr_conn->lconn_server->lsrv_host );
LDAPDebug( LDAP_DEBUG_TRACE,
"chase_one_referral: using hostname '%s' from original "
"request on new request\n",
srv->lsrv_host, 0, 0);
} else {
srv->lsrv_host = nsldapi_strdup( ludp->lud_host );
srv->lsrv_host = nsldapi_strdup( ludp->lud_host );
LDAPDebug( LDAP_DEBUG_TRACE,
"chase_one_referral: using hostname '%s' as specified "
"on new request\n",
srv->lsrv_host, 0, 0);
}
if ( srv->lsrv_host == NULL ) {
@@ -1006,10 +1015,18 @@ chase_one_referral( LDAP *ld, LDAPRequest *lr, LDAPRequest *origreq,
}
}
if ( ludp->lud_port == 0 ) {
srv->lsrv_port = ( secure ) ? LDAPS_PORT : LDAP_PORT;
if ( ludp->lud_port == 0 && ludp->lud_host == NULL ) {
srv->lsrv_port = origreq->lr_conn->lconn_server->lsrv_port;
LDAPDebug( LDAP_DEBUG_TRACE,
"chase_one_referral: using port (%d) from original "
"request on new request\n",
srv->lsrv_port, 0, 0);
} else {
srv->lsrv_port = ludp->lud_port;
LDAPDebug( LDAP_DEBUG_TRACE,
"chase_one_referral: using port (%d) as specified on "
"new request\n",
srv->lsrv_port, 0, 0);
}
if ( secure ) {