Merge remote branch 'origin/mdb.master'

[openldap] / libraries / libldap / addentry.c

diff --git a/libraries/libldap/addentry.c b/libraries/libldap/addentry.c
index ce85e8cb35ebe570dc5561cb8c9f731c93c5e0ab..5194d81b06f3225a9597a912e2684130c770ec0d 100644 (file)
--- a/libraries/libldap/addentry.c
+++ b/libraries/libldap/addentry.c
@@ -1,42 +1,57 @@
-/*
- *  Copyright (c) 1990 Regents of the University of Michigan.
- *  All rights reserved.
+/* addentry.c */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- *  addentry.c
+ * 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.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
+ * All rights reserved.
  */
 
 #include "portable.h"
 
-#ifndef lint 
-static char copyright[] = "@(#) Copyright (c) 1990 Regents of the University of Michigan.\nAll rights reserved.\n";
-#endif
-
 #include <stdio.h>
-#include <stdlib.h>
 
-#include <ac/ctype.h>
+#include <ac/stdlib.h>
+
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
 
-#include "lber.h"
-#include "ldap.h"
+#include "ldap-int.h"
 
 LDAPMessage *
 ldap_delete_result_entry( LDAPMessage **list, LDAPMessage *e )
 {
        LDAPMessage     *tmp, *prev = NULL;
 
+       assert( list != NULL );
+       assert( e != NULL );
+
        for ( tmp = *list; tmp != NULL && tmp != e; tmp = tmp->lm_chain )
                prev = tmp;
 
        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 );
@@ -45,6 +60,13 @@ ldap_delete_result_entry( LDAPMessage **list, LDAPMessage *e )
 void
 ldap_add_result_entry( LDAPMessage **list, LDAPMessage *e )
 {
+       assert( list != NULL );
+       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;
 }