From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 17 Jan 2004 20:07:36 +0000 (+0000)
Subject: Sync with HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_2_5~8
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ae4a5d7face559abe99255232485f30fb5375d5c;p=openldap

Sync with HEAD
---

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 95492f54cf..1ddd783cd2 100644
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -200,6 +200,14 @@ access_allowed(
 		goto done;
 	}
 
+	be = op->o_bd;
+	if ( be == NULL ) {
+		be = &backends[0];
+		be_null = 1;
+		op->o_bd = be;
+	}
+	assert( be != NULL );
+
 #ifdef LDAP_SLAPI
 	if ( op->o_pb != NULL ) {
 		ret = slapi_int_access_allowed( op, e, desc, val, access, state );
@@ -210,14 +218,6 @@ access_allowed(
 	}
 #endif /* LDAP_SLAPI */
 
-	be = op->o_bd;
-	if ( be == NULL ) {
-		be = &backends[0];
-		be_null = 1;
-		op->o_bd = be;
-	}
-	assert( be != NULL );
-
 	/* grant database root access */
 	if ( be != NULL && be_isroot( be, &op->o_ndn ) ) {
 #ifdef NEW_LOGGING
diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 795ff25d87..7d323dd26f 100644
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -1726,7 +1726,7 @@ print_acl( Backend *be, AccessControl *a )
 				fprintf( stderr, "," );
 			}
 			if (an->an_oc) {
-				fputc( '@', stderr);
+				fputc( an->an_oc_exclude ? '!' : '@', stderr);
 			}
 			fputs( an->an_name.bv_val, stderr );
 			first = 0;
diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c
index 185ff81dab..0abb6db23d 100644
--- a/servers/slapd/extended.c
+++ b/servers/slapd/extended.c
@@ -43,7 +43,7 @@
 #include "slapi/slapi.h"
 #endif
 
-#define UNSUPPORTED_EXTENDEDOP "unsupported extended operation"
+#define UNSUPPORTED_EXOP "unsupported extended operation"
 
 #ifdef LDAP_DEVEL
 #define SLAP_EXOP_HIDE 0x0000
@@ -60,8 +60,8 @@ static struct extop_list {
 
 static SLAP_EXTOP_MAIN_FN whoami_extop;
 
-/* this list of built-in extops is for extops that are not part
- * of backends or in external modules.	essentially, this is
+/* This list of built-in extops is for extops that are not part
+ * of backends or in external modules.	Essentially, this is
  * just a way to get built-in extops onto the extop list without
  * having a separate init routine for each built-in extop.
  */
@@ -269,7 +269,7 @@ do_extended(
 
 		} else if ( extop_rc == SLAPI_PLUGIN_EXTENDED_NOT_HANDLED ) {
 			rs->sr_err = LDAP_PROTOCOL_ERROR;
-			rs->sr_text = UNSUPPORTED_EXTENDEDOP;
+			rs->sr_text = UNSUPPORTED_EXOP;
 
 		} else {
 			rs->sr_err = slapi_pblock_get( pb, SLAPI_EXT_OP_RET_OID,