upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-31 20:19:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#5739 fix for ITS#4879 was too eager about IPv6 detection

Browse source
This commit is contained in:
Howard Chu 2008-11-03 15:44:49 +00:00
parent 4e22081e02
commit 24078323e2
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/libldap/url.c
View file

@ -590,9 +590,11 @@ desc2str_len( LDAPURLDesc *u )
}
if ( u->lud_host && u->lud_host[0] ) {
char *ptr;
len += hex_escape_len( u->lud_host, URLESC_SLASH );
if ( !is_ipc && strchr( u->lud_host, ':' )) {
len += 2; /* IPv6, [] */
if ( !is_ipc && ( ptr = strchr( u->lud_host, ':' ))) {
if ( strchr( ptr+1, ':' ))
len += 2; /* IPv6, [] */
}
}
@ -610,6 +612,7 @@ desc2str( LDAPURLDesc *u, char *s, int len )
int is_v6 = 0;
int is_ipc = 0;
struct berval scope = BER_BVNULL;
char *ptr;
if ( u == NULL ) {
return -1;
@ -637,8 +640,9 @@ desc2str( LDAPURLDesc *u, char *s, int len )
sep = 1;
}
if ( !is_ipc && u->lud_host && strchr( u->lud_host, ':' )) {
is_v6 = 1;
if ( !is_ipc && u->lud_host && ( ptr = strchr( u->lud_host, ':' ))) {
if ( strchr( ptr+1, ':' ))
is_v6 = 1;
}
if ( u->lud_port ) {