X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Faddentry.c;h=5194d81b06f3225a9597a912e2684130c770ec0d;hb=c8c34cdd43d3603f3b64a56841b4425379c98f45;hp=4ee6870222cb51e07129fdf0f5f359cda5e47e14;hpb=29d9fa20a2823c827f098d78f1ea8539d86bf4cf;p=openldap
diff --git a/libraries/libldap/addentry.c b/libraries/libldap/addentry.c
index 4ee6870222..5194d81b06 100644
--- a/libraries/libldap/addentry.c
+++ b/libraries/libldap/addentry.c
@@ -1,13 +1,20 @@
+/* addentry.c */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-/* Portions
- * Copyright (c) 1990 Regents of the University of Michigan.
- * All rights reserved.
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2011 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
*
- * addentry.c
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
+ */
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
+ * All rights reserved.
*/
#include "portable.h"
@@ -16,7 +23,6 @@
#include
-#include
#include
#include
#include
@@ -37,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 );
@@ -53,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;
}