X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fsearch.c;h=50f50067ff92dfe2d6d32fcd46f9226367758429;hb=a2eec74fc1d535fa9092f4d7b82a669b39eef539;hp=b57ac9730c9587a0224c5acce32fa5d3cf9aeece;hpb=49f414738569096eae2c94a4f05f0f3f2636b8b7;p=openldap

diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c
index b57ac9730c..50f50067ff 100644
--- a/libraries/libldap/search.c
+++ b/libraries/libldap/search.c
@@ -16,7 +16,6 @@
 
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
@@ -92,11 +91,19 @@ ldap_search_ext(
 	int sizelimit,
 	int *msgidp )
 {
+	int rc;
 	BerElement	*ber;
 	int timelimit;
 
 	Debug( LDAP_DEBUG_TRACE, "ldap_search_ext\n", 0, 0, 0 );
 
+	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
+
+	/* check client controls */
+	rc = ldap_int_client_controls( ld, cctrls );
+	if( rc != LDAP_SUCCESS ) return rc;
+
 	/*
 	 * if timeout is provided, both tv_sec and tv_usec must
 	 * be non-zero
@@ -208,6 +215,9 @@ ldap_search(
 
 	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 ); 
 
@@ -288,22 +298,27 @@ ldap_build_search_req(
 	}
 
 #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
+	if ( LDAP_IS_UDP(ld) ) {
+	    err = ber_write( ber, ld->ld_options.ldo_peer,
+		    sizeof(struct sockaddr), 0);
+	}
+	if ( LDAP_IS_UDP(ld) && ld->ld_options.ldo_version == LDAP_VERSION2) {
+	    char *dn = ld->ld_options.ldo_cldapdn;
+	    if (!dn) dn = "";
+	    err = ber_printf( ber, "{ist{seeiib", ++ld->ld_msgid, dn,
+		LDAP_REQ_SEARCH, base, (ber_int_t) scope, ld->ld_deref,
+		(sizelimit < 0) ? ld->ld_sizelimit : sizelimit,
+		(timelimit < 0) ? ld->ld_timelimit : timelimit,
+		attrsonly );
+	} else
+#endif
+	{
+	    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 );
 	}
-#endif /* LDAP_CONNECTIONLESS */
 
 	if ( err == -1 ) {
 		ld->ld_errno = LDAP_ENCODING_ERROR;
@@ -578,7 +593,7 @@ put_filter( BerElement *ber, char *str )
 			parens++;
 
 			/* skip spaces */
-			while( isspace( *str ) ) str++;
+			while( LDAP_SPACE( *str ) ) str++;
 
 			switch ( *str ) {
 			case '&':
@@ -690,7 +705,7 @@ put_filter_list( BerElement *ber, char *str )
 	Debug( LDAP_DEBUG_TRACE, "put_filter_list \"%s\"\n", str, 0, 0 );
 
 	while ( *str ) {
-		while ( *str && isspace( (unsigned char) *str ) )
+		while ( *str && LDAP_SPACE( (unsigned char) *str ) )
 			str++;
 		if ( *str == '\0' )
 			break;
@@ -766,38 +781,39 @@ put_simple_filter(
 
 			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;
 			}
@@ -806,13 +822,13 @@ put_simple_filter(
 				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' ) {
@@ -831,7 +847,7 @@ put_simple_filter(
 				}
 			}
 		}
-		break;
+		goto done;
 
 	default:
 		if ( ldap_pvt_find_wildcard( value ) == NULL ) {