Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / servers / slapd / abandon.c

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index 8e0870775685c6b739dc0b0c9f0704edac6d1600..3be9d3807dcece79651e2eb3f5e831e4bc59b3e1 100644 (file)
--- a/servers/slapd/abandon.c
+++ b/servers/slapd/abandon.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2009 The OpenLDAP Foundation.
+ * Copyright 1998-2014 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -96,6 +96,17 @@ do_abandon( Operation *op, SlapReply *rs )
                                break;
                        }
                }
+
+       } else if ( o->o_tag == LDAP_REQ_BIND
+                       || o->o_tag == LDAP_REQ_UNBIND
+                       || o->o_tag == LDAP_REQ_ABANDON ) {
+               msg = "cannot be abandoned";
+
+#if 0 /* Would break o_abandon used as "suppress response" flag, ITS#6138 */
+       } else if ( o->o_abandon ) {
+               msg = "already being abandoned";
+#endif
+
        } else {
                msg = "found";
                /* Set the o_abandon flag in the to-be-abandoned operation.