X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fsearch.c;h=5adb5b8ed2d7aa976264eb91664b6c5df1d1f745;hb=241d6a558e3bfd7a7cfc70a1de65fa527fe40e60;hp=4f028b0b1e4dc4901b6acdea267dfff590f79728;hpb=5d899f0c00277dcc111b715e750505e836adaea1;p=openldap

diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c
index 4f028b0b1e..5adb5b8ed2 100644
--- a/libraries/libldap/search.c
+++ b/libraries/libldap/search.c
@@ -91,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
@@ -207,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 );