ITS#2764, #2781 revert backend.c patch, just catch the NULL referral

[openldap] / servers / slapd / abandon.c

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index 5a40f94dc57c9e5fcbce67f9427df584f707d94d..98a6f8c10467425b177ccf1301639cca8fad5225 100644 (file)
--- a/servers/slapd/abandon.c
+++ b/servers/slapd/abandon.c
@@ -1,12 +1,19 @@
 /* abandon.c - decode and handle an ldap abandon operation */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 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>.
  */
-
-/*
- * Copyright (c) 1995 Regents of the University of Michigan.
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -46,7 +53,7 @@ do_abandon( Operation *op, SlapReply *rs )
        if ( ber_scanf( op->o_ber, "i", &id ) == LBER_ERROR ) {
 #ifdef NEW_LOGGING
                LDAP_LOG( OPERATION, ERR, 
-                       "conn: %d do_abandon: ber_scanf failed\n", conn->c_connid, 0, 0 );
+                       "conn: %d do_abandon: ber_scanf failed\n", op->o_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "do_abandon: ber_scanf failed\n", 0, 0 ,0 );
 #endif
@@ -103,7 +110,7 @@ do_abandon( Operation *op, SlapReply *rs )
 
 done:
 
-       op->oq_abandon.rs_msgid = id;
+       op->orn_msgid = id;
        for ( i = 0; i < nbackends; i++ ) {
                op->o_bd = &backends[i];