X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fresult.c;h=36df94b712776a5ce60ca65591aeacc7633bde71;hb=8045b54124f0365b3d34d9d3220256f052f2b76b;hp=e517a059ab23a8348741ff47208b468ddc2e988f;hpb=fb3b8e5ef165db2244dfb280cfd79f065e13460a;p=openldap

diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index e517a059ab..36df94b712 100644
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -143,8 +144,11 @@ ldap_result(
 		lastlm->lm_next = (all == 0 && lm->lm_chain != NULL
 		    ? lm->lm_chain : lm->lm_next);
 	}
-	if ( all == 0 )
+	if ( all == 0 && lm->lm_chain != NULL )
+	{
+		lm->lm_chain->lm_next = lm->lm_next;
 		lm->lm_chain = NULL;
+	}
 	lm->lm_next = NULL;
 
 	*result = lm;
@@ -340,7 +344,7 @@ try_read1msg(
 	if (( lr = ldap_find_request_by_msgid( ld, id )) == NULL ) {
 		Debug( LDAP_DEBUG_ANY,
 		    "no request for response with msgid %ld (tossing)\n",
-		    id, 0, 0 );
+		    (long) id, 0, 0 );
 		ber_free( ber, 1 );
 		return( -2 );	/* continue looking */
 	}
@@ -352,10 +356,10 @@ try_read1msg(
 		return( -1 );
 	}
 
-	Debug( LDAP_DEBUG_TRACE, "ldap_read: %s msgid %ld, original id %d\n",
+	Debug( LDAP_DEBUG_TRACE, "ldap_read: %s msgid %ld, original id %ld\n",
 	    ( tag == LDAP_RES_SEARCH_ENTRY ) ? "entry" : 
 		( tag == LDAP_RES_SEARCH_REFERENCE ) ? "reference" : "result",
-		id, lr->lr_origid );
+		(long) id, (long) lr->lr_origid );
 
 	id = lr->lr_origid;
 	refer_cnt = 0;
@@ -428,7 +432,7 @@ Debug( LDAP_DEBUG_TRACE,
 				id = lr->lr_msgid;
 				tag = lr->lr_res_msgtype;
 				Debug( LDAP_DEBUG_ANY, "request %ld done\n",
-				    id, 0, 0 );
+				    (long) id, 0, 0 );
 Debug( LDAP_DEBUG_TRACE,
 "res_errno: %d, res_error: <%s>, res_matched: <%s>\n",
 lr->lr_res_errno, lr->lr_res_error ? lr->lr_res_error : "",
@@ -510,8 +514,8 @@ lr->lr_res_matched ? lr->lr_res_matched : "" );
 		return( -2 );	/* continue looking */
 	}
 
-	Debug( LDAP_DEBUG_TRACE, "adding response id %d type %d:\n",
-	    new->lm_msgid, new->lm_msgtype, 0 );
+	Debug( LDAP_DEBUG_TRACE, "adding response id %ld type %ld:\n",
+	    (long) new->lm_msgid, (long) new->lm_msgtype, 0 );
 
 	/* part of a search response - add to end of list of entries */
 	for ( tmp = l; tmp->lm_chain != NULL &&
@@ -642,7 +646,7 @@ int
 ldap_msgtype( LDAPMessage *lm )
 {
 	assert( lm != NULL );
-	return ( lm == NULL ) ? lm->lm_msgtype : -1;
+	return ( lm != NULL ) ? lm->lm_msgtype : -1;
 }
 
 
@@ -651,7 +655,7 @@ ldap_msgid( LDAPMessage *lm )
 {
 	assert( lm != NULL );
 
-	return ( lm == NULL ) ? lm->lm_msgid : -1;
+	return ( lm != NULL ) ? lm->lm_msgid : -1;
 }