X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fabandon.c;h=8900f5d152b853d2264f66b857035adc7aee9900;hb=ef7f5f5e32e6e0f129aee7fa1626017a7dadcb48;hp=8e0870775685c6b739dc0b0c9f0704edac6d1600;hpb=acba4f77556d50e2cb6cfb75dd96fa2ea32a2452;p=openldap

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index 8e08707756..8900f5d152 100644
--- 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-2011 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.