X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Faddentry.c;h=755cf50d8f69b38b39e565458ff68ab5fda2197f;hb=a5cad3f18a4b8fbbbb1bfc5db9d00022d9ebbfc4;hp=66d1da6d125c69e6f7af705a4372be00aa58b2fe;hpb=159de0f1359459371c590ac770cc30edbade58d5;p=openldap

diff --git a/libraries/libldap/addentry.c b/libraries/libldap/addentry.c
index 66d1da6d12..755cf50d8f 100644
--- a/libraries/libldap/addentry.c
+++ b/libraries/libldap/addentry.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2010 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,10 +43,15 @@ ldap_delete_result_entry( LDAPMessage **list, LDAPMessage *e )
 	if ( tmp == NULL )
 		return( NULL );
 
-	if ( prev == NULL )
+	if ( prev == NULL ) {
+		if ( tmp->lm_chain )
+			tmp->lm_chain->lm_chain_tail = (*list)->lm_chain_tail;
 		*list = tmp->lm_chain;
-	else
+	} else {
 		prev->lm_chain = tmp->lm_chain;
+		if ( prev->lm_chain == NULL )
+			(*list)->lm_chain_tail = prev;
+	}
 	tmp->lm_chain = NULL;
 
 	return( tmp );
@@ -59,5 +64,9 @@ ldap_add_result_entry( LDAPMessage **list, LDAPMessage *e )
 	assert( e != NULL );
 
 	e->lm_chain = *list;
+	if ( *list )
+		e->lm_chain_tail = (*list)->lm_chain_tail;
+	else
+		e->lm_chain_tail = e;
 	*list = e;
 }