Debug( LDAP_DEBUG_TRACE, "ldap_search_ext\n", 0, 0, 0 );
+ assert( ld != NULL );
+ assert( LDAP_VALID( ld ) );
+
/*
* if timeout is provided, both tv_sec and tv_usec must
* be non-zero
Debug( LDAP_DEBUG_TRACE, "ldap_search\n", 0, 0, 0 );
+ assert( ld != NULL );
+ assert( LDAP_VALID( ld ) );
+
ber = ldap_build_search_req( ld, base, scope, filter, attrs,
attrsonly, NULL, NULL, -1, -1 );
}
}
-#ifdef LDAP_CONNECTIONLESS
- if ( ld->ld_cldapnaddr > 0 ) {
- err = ber_printf( ber, "{ist{seeiib", ++ld->ld_msgid,
- ld->ld_cldapdn, LDAP_REQ_SEARCH, base, scope, ld->ld_deref,
- (sizelimit < 0) ? ld->ld_sizelimit : sizelimit,
- (timelimit < 0) ? ld->ld_timelimit : timelimit,
- attrsonly );
- } else {
-#endif /* LDAP_CONNECTIONLESS */
- err = ber_printf( ber, "{it{seeiib", ++ld->ld_msgid,
- LDAP_REQ_SEARCH, base, (ber_int_t) scope, ld->ld_deref,
- (sizelimit < 0) ? ld->ld_sizelimit : sizelimit,
- (timelimit < 0) ? ld->ld_timelimit : timelimit,
- attrsonly );
-#ifdef LDAP_CONNECTIONLESS
- }
-#endif /* LDAP_CONNECTIONLESS */
+ err = ber_printf( ber, "{it{seeiib", ++ld->ld_msgid,
+ LDAP_REQ_SEARCH, base, (ber_int_t) scope, ld->ld_deref,
+ (sizelimit < 0) ? ld->ld_sizelimit : sizelimit,
+ (timelimit < 0) ? ld->ld_timelimit : timelimit,
+ attrsonly );
if ( err == -1 ) {
ld->ld_errno = LDAP_ENCODING_ERROR;
if( dn == NULL ) {
if(! ldap_is_attr_desc( str ) ) goto done;
- break;
- }
+ } else {
- *dn++ = '\0';
- rule = strchr( dn, ':' );
+ *dn++ = '\0';
+ rule = strchr( dn, ':' );
- if( rule == NULL ) {
- /* one colon */
- if ( strcmp(dn, "dn") == 0 ) {
- /* must have attribute */
- if( !ldap_is_attr_desc( str ) ) {
- goto done;
- }
+ if( rule == NULL ) {
+ /* one colon */
+ if ( strcmp(dn, "dn") == 0 ) {
+ /* must have attribute */
+ if( !ldap_is_attr_desc( str ) ) {
+ goto done;
+ }
- rule = "";
+ rule = "";
- } else {
- rule = dn;
- dn = NULL;
- }
+ } else {
+ rule = dn;
+ dn = NULL;
+ }
- } else {
- /* two colons */
- *rule++ = '\0';
+ } else {
+ /* two colons */
+ *rule++ = '\0';
- if ( strcmp(dn, "dn") != 0 ) {
- /* must have "dn" */
- goto done;
+ if ( strcmp(dn, "dn") != 0 ) {
+ /* must have "dn" */
+ goto done;
+ }
}
+
}
- if ( *str == '\0' && *rule == '\0' ) {
+ if ( *str == '\0' && ( !rule || *rule == '\0' ) ) {
/* must have either type or rule */
goto done;
}
goto done;
}
- if ( *rule != '\0' && !ldap_is_attr_oid( rule ) ) {
+ if ( rule && *rule != '\0' && !ldap_is_attr_oid( rule ) ) {
goto done;
}
rc = ber_printf( ber, "t{" /*}*/, ftype );
- if( rc != -1 && *rule != '\0' ) {
+ if( rc != -1 && rule && *rule != '\0' ) {
rc = ber_printf( ber, "ts", LDAP_FILTER_EXT_OID, rule );
}
if( rc != -1 && *str != '\0' ) {
}
}
}
- break;
+ goto done;
default:
if ( ldap_pvt_find_wildcard( value ) == NULL ) {