[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kioslave/ldap
From:       Szombathelyi György <gyurco () freemail ! hu>
Date:       2004-03-21 0:23:12
Message-ID: 20040321002312.3507F9993 () office ! kde ! org
[Download RAW message or body]

CVS commit by gyurco: 

Check for errors after ldap_next_entry() & ldap_first_entry()


  M +7 -6      kio_ldap.cpp   1.33


--- kdebase/kioslave/ldap/kio_ldap.cpp  #1.32:1.33
@@ -80,5 +80,5 @@ void LDAPProtocol::checkErr( const KURL 
     error( KIO::ERR_UNKNOWN, _url.prettyURL() );
   } else {
-    LDAPErr( ret, _url.prettyURL() );
+    if ( ret != LDAP_SUCCESS ) LDAPErr( ret, _url.prettyURL() );
   }
 }
@@ -641,7 +641,7 @@ void LDAPProtocol::get( const KURL &_url
       return;
     }
+    kdDebug(7125) << " ldap_result: " << ret << endl;
     if ( ret == LDAP_RES_SEARCH_RESULT ) break;
     if ( ret != LDAP_RES_SEARCH_ENTRY ) continue;
-    kdDebug(7125) << " ldap_result: " << ret << endl;
     
     entry = ldap_first_entry( mLDAP, msg );
@@ -653,8 +653,9 @@ void LDAPProtocol::get( const KURL &_url
       data(array);
       processedSize( processed_size );
-      array.resetRawData(result.data(), result.length() );
+      array.resetRawData( result.data(), result.length() );
     
-      entry = ldap_next_entry(mLDAP, entry);
+      entry = ldap_next_entry( mLDAP, entry );
     }
+    checkErr( _url );
   
     ldap_msgfree(msg);
@@ -994,5 +995,5 @@ void LDAPProtocol::listDir( const KURL &
       entry = ldap_next_entry( mLDAP, entry );
     }
-  
+    checkErr( _url );
     ldap_msgfree( msg );
   }


[prev in list] [next in list] [prev in thread] [next in thread]