Don't throw an exception in ldapWaitResult()

diff --git a/modules/ldapbackend/ldaputils.cc b/modules/ldapbackend/ldaputils.cc
index 35ee0c36bc50ed4ad7598fcf2336e056b203e0f2..08cb2c28f249915eb75403f829db52511c728f27 100644 (file)
--- a/modules/ldapbackend/ldaputils.cc
+++ b/modules/ldapbackend/ldaputils.cc
@@ -35,13 +35,8 @@ int ldapWaitResult( LDAP *conn, int msgid, int timeout, LDAPMessage** result )
 
        int rc = ldap_result( conn, msgid, LDAP_MSG_ONE, &tv, &res );
 
-       switch( rc )
-       {
-               case -1:
-                       throw LDAPException( "Error waiting for LDAP result: " + ldapGetError( conn, rc ) );
-               case 0:
-                       throw LDAPTimeout();
-       }
+       if ( rc == -1 || rc == 0 )
+               return rc;
 
        if( result == NULL )
        {

diff --git a/modules/ldapbackend/powerldap.cc b/modules/ldapbackend/powerldap.cc
index 646c642a52b098dc428dd53af6aecdb8bcb65b01..f91b5de68ef93acf592183fededf492e563003f6 100644 (file)
--- a/modules/ldapbackend/powerldap.cc
+++ b/modules/ldapbackend/powerldap.cc
@@ -173,13 +173,7 @@ int PowerLDAP::search( const string& base, int scope, const string& filter, cons
 
 int PowerLDAP::waitResult( int msgid, int timeout, LDAPMessage** result )
 {
-        try {
-               return ldapWaitResult( d_ld, msgid, timeout, result );
-        }
-        catch ( LDAPException &e ) {
-               ensureConnect();
-               throw; // Not sure why this was done, but the original behavior.
-        }
+       return ldapWaitResult( d_ld, msgid, timeout, result );
 }