mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

better implementation for ITS#4996 and docs (ldapsearch(1) only; need to duplicate in other tools man pages)

Browse Source
This commit is contained in:
Pierangelo Masarati 2007-06-19 22:58:20 +00:00
parent d6ef5f3a0d
commit f4239db146
2 changed files with 112 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
clients/tools/common.c
View File

@ -959,16 +959,22 @@ tool_conn_setup( int dont, void (*private_setup)( LDAP * ) )
ldapuri = ldap_url_desc2str( &url );
} else if ( ldapuri != NULL ) {
LDAPURLDesc *lud;
LDAPURLDesc *ludlist, **ludp;
char **urls = NULL;
int nurls = 0;
rc = ldap_url_parse( ldapuri, &lud );
rc = ldap_url_parselist( &ludlist, ldapuri );
if ( rc != LDAP_URL_SUCCESS ) {
fprintf( stderr,
"Could not parse LDAP URI=%s (%d)\n",
"Could not parse LDAP URI(s)=%s (%d)\n",
ldapuri, rc );
exit( EXIT_FAILURE );
}
for ( ludp = &ludlist; *ludp != NULL; ) {
LDAPURLDesc *lud = *ludp;
char **tmp;
if ( lud->lud_dn != NULL && lud->lud_dn[ 0 ] != '\0' &&
( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) )
{
@ -978,14 +984,10 @@ tool_conn_setup( int dont, void (*private_setup)( LDAP * ) )
* using the scheme provided */
char *domain = NULL,
*hostlist = NULL,
**hosts = NULL,
**urls = NULL;
**hosts = NULL;
int i,
len_proto = strlen( lud->lud_scheme );
ber_memfree( ldapuri );
ldapuri = NULL;
if ( ldap_dn2domain( lud->lud_dn, &domain )
|| domain == NULL )
{
@ -1017,12 +1019,14 @@ tool_conn_setup( int dont, void (*private_setup)( LDAP * ) )
for ( i = 0; hosts[ i ] != NULL; i++ )
/* count'em */ ;
urls = (char **)calloc( sizeof( char * ), i + 1 );
if ( urls == NULL ) {
tmp = (char **)realloc( urls, sizeof( char * ) * ( nurls + i + 1 ) );
if ( tmp == NULL ) {
fprintf( stderr,
"DNS SRV: out of memory?\n" );
goto dnssrv_free;
}
urls = tmp;
urls[ nurls ] = NULL;
for ( i = 0; hosts[ i ] != NULL; i++ ) {
size_t len = len_proto
@ -1030,30 +1034,60 @@ tool_conn_setup( int dont, void (*private_setup)( LDAP * ) )
+ strlen( hosts[ i ] )
+ 1;
urls[ i ] = (char *)malloc( sizeof( char ) * len );
if ( urls[ i ] == NULL ) {
urls[ nurls + i + 1 ] = NULL;
urls[ nurls + i ] = (char *)malloc( sizeof( char ) * len );
if ( urls[ nurls + i ] == NULL ) {
fprintf( stderr,
"DNS SRV: out of memory?\n" );
goto dnssrv_free;
}
snprintf( urls[ i ], len, "%s://%s",
snprintf( urls[ nurls + i ], len, "%s://%s",
lud->lud_scheme, hosts[ i ] );
}
ldapuri = ldap_charray2str( urls, " " );
nurls += i;
dnssrv_free:;
ber_memvfree( (void **)hosts );
ber_memvfree( (void **)urls );
ber_memfree( hostlist );
ber_memfree( domain );
} else {
tmp = (char **)realloc( urls, sizeof( char * ) * ( nurls + 2 ) );
if ( tmp == NULL ) {
fprintf( stderr,
"DNS SRV: out of memory?\n" );
break;
}
urls = tmp;
urls[ nurls + 1 ] = NULL;
urls[ nurls ] = ldap_url_desc2str( lud );
if ( urls[ nurls ] == NULL ) {
fprintf( stderr,
"DNS SRV: out of memory?\n" );
break;
}
nurls++;
}
*ludp = lud->lud_next;
lud->lud_next = NULL;
ldap_free_urldesc( lud );
if ( ldapuri == NULL ) {
}
if ( ludlist != NULL ) {
ldap_free_urllist( ludlist );
exit( EXIT_FAILURE );
} else if ( urls == NULL ) {
exit( EXIT_FAILURE );
}
ldap_memfree( ldapuri );
ldapuri = ldap_charray2str( urls, " " );
ber_memvfree( (void **)urls );
}
if ( verbose ) {

11
doc/man/man1/ldapsearch.1
View File

@ -206,9 +206,14 @@ Use complete contents of \fIpasswdfile\fP as the password for
simple authentication.
.TP
.BI \-H \ ldapuri
Specify URI(s) referring to the ldap server(s); only the protocol/host/port
fields are allowed; a list of URI, separated by whitespace or commas
is expected.
Specify URI(s) referring to the ldap server(s);
a list of URI, separated by whitespace or commas is expected;
only the protocol/host/port fields are allowed.
As an exception, if no host/port is specified, but a DN is,
the DN is used to look up the corresponding host(s) using the
DNS SRV records, according to RFC 2782. The DN must be a non-empty
sequence of AVAs whose attribute type is "dc" (domain component),
and must be escaped according to RFC 2396.
.TP
.BI \-h \ ldaphost
Specify an alternate host on which the ldap server is running.