ITS#3359: fix crash on recursive rebind following referral

diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index dd41a27a9c27af7903d06c5bbed24170ddca0e6d..44c0e98ef4ee74ce10bc24b26390e1b9247e87f8 100644 (file)
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -243,11 +243,13 @@ wait4msg(
 
 #ifdef LDAP_DEBUG
        if ( timeout == NULL ) {
-               Debug( LDAP_DEBUG_TRACE, "wait4msg (infinite timeout), msgid %d\n",
-                   msgid, 0, 0 );
+               Debug( LDAP_DEBUG_TRACE,
+                       "wait4msg (infinite timeout), msgid %d\n",
+                       msgid, 0, 0 );
        } else {
-               Debug( LDAP_DEBUG_TRACE, "wait4msg (timeout %ld sec, %ld usec), msgid %d\n",
-                      (long) timeout->tv_sec, (long) timeout->tv_usec, msgid );
+               Debug( LDAP_DEBUG_TRACE,
+                       "wait4msg (timeout %ld sec, %ld usec), msgid %d\n",
+                       (long) timeout->tv_sec, (long) timeout->tv_usec, msgid );
        }
 #endif /* LDAP_DEBUG */
 
@@ -302,7 +304,7 @@ wait4msg(
                            {
                                    ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN :
                                        LDAP_TIMEOUT);
-                                   return( rc );
+                                   return -1;
                            }
 
                            if ( rc == -1 ) {
@@ -351,7 +353,7 @@ wait4msg(
                }
        }
 
-       return( rc );
+       return rc;
 }