Commit c6c4aaa1 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

merge in passwd backend search sizelimit bugfix from -devel

parent c0a303ba
...@@ -80,14 +80,6 @@ passwd_back_search( ...@@ -80,14 +80,6 @@ passwd_back_search(
} }
pthread_mutex_unlock( &op->o_abandonmutex ); pthread_mutex_unlock( &op->o_abandonmutex );
/* check size limit */
if ( --slimit == -1 ) {
send_ldap_result( conn, op, LDAP_SIZELIMIT_EXCEEDED,
NULL, NULL );
endpwent();
return( 0 );
}
/* check time limit */ /* check time limit */
pthread_mutex_lock( &currenttime_mutex ); pthread_mutex_lock( &currenttime_mutex );
time( &currenttime ); time( &currenttime );
...@@ -103,6 +95,14 @@ passwd_back_search( ...@@ -103,6 +95,14 @@ passwd_back_search(
e = pw2entry( be, pw ); e = pw2entry( be, pw );
if ( test_filter( be, conn, op, e, filter ) == 0 ) { if ( test_filter( be, conn, op, e, filter ) == 0 ) {
/* check size limit */
if ( --slimit == -1 ) {
send_ldap_result( conn, op, LDAP_SIZELIMIT_EXCEEDED,
NULL, NULL );
endpwent();
return( 0 );
}
send_search_entry( be, conn, op, e, attrs, attrsonly ); send_search_entry( be, conn, op, e, attrs, attrsonly );
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment