Handle timeouts from ldap_result()

diff --git a/libraries/libldap/add.c b/libraries/libldap/add.c
index 03d1adaabd20cff53e02e4c903c8d4a58761e744..f36dfc8a0f05269be3fae9acdf0ebdbd62437959 100644 (file)
--- a/libraries/libldap/add.c
+++ b/libraries/libldap/add.c
@@ -208,7 +208,7 @@ ldap_add_ext_s(
        if ( rc != LDAP_SUCCESS )
                return( rc );
 
-       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 )
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 || !res )
                return( ld->ld_errno );
 
        return( ldap_result2error( ld, res, 1 ) );

diff --git a/libraries/libldap/compare.c b/libraries/libldap/compare.c
index 2af680d891826e33eaf0186ef7236b982a2749f3..0eb5155eb77d73a61b1895fa4635cb75a1d62bd0 100644 (file)
--- a/libraries/libldap/compare.c
+++ b/libraries/libldap/compare.c
@@ -153,7 +153,7 @@ ldap_compare_ext_s(
        if (  rc != LDAP_SUCCESS )
                return( rc );
 
-       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 )
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 || !res )
                return( ld->ld_errno );
 
        return( ldap_result2error( ld, res, 1 ) );

diff --git a/libraries/libldap/dds.c b/libraries/libldap/dds.c
index bfaf9b7fb3667a36366b0d493aa7b6a2e9d18f0b..88ec16f4bd13a15cd8592d83aee36ce2e3c2e16f 100644 (file)
--- a/libraries/libldap/dds.c
+++ b/libraries/libldap/dds.c
@@ -142,7 +142,7 @@ ldap_refresh_s(
        if ( rc != LDAP_SUCCESS ) return rc;
        
        rc = ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *)NULL, &res );
-       if( rc == -1 ) return ld->ld_errno;
+       if( rc == -1 || !res ) return ld->ld_errno;
 
        rc = ldap_parse_refresh( ld, res, newttl );
        if( rc != LDAP_SUCCESS ) {

diff --git a/libraries/libldap/delete.c b/libraries/libldap/delete.c
index 52b7f2d80d3fc7bb8be1cd89a7f03dc58c612433..0e51608a68685a3d317dc1e027b8171567eec5c1 100644 (file)
--- a/libraries/libldap/delete.c
+++ b/libraries/libldap/delete.c
@@ -120,7 +120,7 @@ ldap_delete_ext_s(
        if( rc != LDAP_SUCCESS )
                return( ld->ld_errno );
 
-       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 )
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 || !res )
                return( ld->ld_errno );
 
        return( ldap_result2error( ld, res, 1 ) );

diff --git a/libraries/libldap/extended.c b/libraries/libldap/extended.c
index 60ad3c92fe226eb6f719eec8d802ff9937ad5496..644180de0ecf0662291c4363544fb5131e8f54f5 100644 (file)
--- a/libraries/libldap/extended.c
+++ b/libraries/libldap/extended.c
@@ -138,7 +138,7 @@ ldap_extended_operation_s(
         return( rc );
        }
  
-    if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 ) {
+    if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 || !res ) {
         return( ld->ld_errno );
        }
 

diff --git a/libraries/libldap/modify.c b/libraries/libldap/modify.c
index f237b2426e137939076b76e11abcc9d899f4e571..41b75e712d08ae57dff4ee0b845b1e4d19a1e48c 100644 (file)
--- a/libraries/libldap/modify.c
+++ b/libraries/libldap/modify.c
@@ -201,7 +201,7 @@ ldap_modify_ext_s( LDAP *ld, LDAP_CONST char *dn,
        if ( rc != LDAP_SUCCESS )
                return( rc );
 
-       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 )
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 || !res )
                return( ld->ld_errno );
 
        return( ldap_result2error( ld, res, 1 ) );

diff --git a/libraries/libldap/modrdn.c b/libraries/libldap/modrdn.c
index b7c31ffb9f98338aa3ac10f4086c412ca49e8504..bc3c8590d4a0ce7a60d7fb96e95247f518b54e29 100644 (file)
--- a/libraries/libldap/modrdn.c
+++ b/libraries/libldap/modrdn.c
@@ -219,7 +219,7 @@ ldap_rename_s(
 
        rc = ldap_result( ld, msgid, LDAP_MSG_ALL, NULL, &res );
 
-       if( rc == -1 ) {
+       if( rc == -1 || !res ) {
                return ld->ld_errno;
        }
 

diff --git a/libraries/libldap/passwd.c b/libraries/libldap/passwd.c
index 704e495b1a16dc11ed5ece459cfe67ab26c1d9d9..b6caab58310268cf8afd804b540637882a9f477f 100644 (file)
--- a/libraries/libldap/passwd.c
+++ b/libraries/libldap/passwd.c
@@ -156,7 +156,7 @@ ldap_passwd_s(
                return rc;
        }
 
-       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 ) {
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 || !res ) {
                return ld->ld_errno;
        }
 

diff --git a/libraries/libldap/sasl.c b/libraries/libldap/sasl.c
index 5fc48e2155b0dde0fd5a3d38bef0567ca55f46ff..0b02065c351ca20ab5ba957ea184efb17123744d 100644 (file)
--- a/libraries/libldap/sasl.c
+++ b/libraries/libldap/sasl.c
@@ -191,7 +191,7 @@ ldap_sasl_bind_s(
        }
 #endif
 
-       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, NULL, &result ) == -1 ) {
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, NULL, &result ) == -1 || !result ) {
                return( ld->ld_errno ); /* ldap_result sets ld_errno */
        }
 

diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c
index 0ff402ea6997d9cdeafe6bb971bfc84475e16c9b..a09b8301cab484ef5b618f3795008c456a859f4d 100644 (file)
--- a/libraries/libldap/search.c
+++ b/libraries/libldap/search.c
@@ -385,7 +385,7 @@ ldap_search_s(
            == -1 )
                return( ld->ld_errno );
 
-       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, res ) == -1 )
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, res ) == -1 || !res )
                return( ld->ld_errno );
 
        return( ldap_result2error( ld, *res, 0 ) );

diff --git a/libraries/libldap/whoami.c b/libraries/libldap/whoami.c
index 851f6659f0bf0a943a6b6471bac170f74b72484e..f77ebb5069b5b6da6314acff0b9fba53034f1ab7 100644 (file)
--- a/libraries/libldap/whoami.c
+++ b/libraries/libldap/whoami.c
@@ -88,7 +88,7 @@ ldap_whoami_s(
        rc = ldap_whoami( ld, sctrls, cctrls, &msgid );
        if ( rc != LDAP_SUCCESS ) return rc;
 
-       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 ) {
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 || !res ) {
                return ld->ld_errno;
        }