X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslapacl.c;h=5fdeae7e3125c8859de5c3236a92853657563ac3;hb=62b6b326338d5162b0f570eaeb8a227fbc5a9c62;hp=31b68b7aac93d8a6058cee419dd09e90db65a91b;hpb=854863f0b6d2fe30c5b4a74c8137b28d5e8c2fca;p=openldap

diff --git a/servers/slapd/slapacl.c b/servers/slapd/slapacl.c
index 31b68b7aac..5fdeae7e31 100644
--- a/servers/slapd/slapacl.c
+++ b/servers/slapd/slapacl.c
@@ -43,9 +43,6 @@ slapacl( int argc, char **argv )
 	Operation		op;
 	Entry			e = { 0 };
 
-#ifdef NEW_LOGGING
-	lutil_log_initialize( argc, argv );
-#endif
 	slap_tool_init( progname, SLAPACL, argc, argv );
 
 	argv = &argv[ optind ];
@@ -144,14 +141,25 @@ slapacl( int argc, char **argv )
 			break;
 		}
 
-		(void)access_allowed_mask( &op, &e, desc, &val, access,
+		rc = access_allowed_mask( &op, &e, desc, &val, access,
 				NULL, &mask );
 
-		fprintf( stderr, "%s%s%s: %s\n",
-				desc->ad_cname.bv_val,
-				val.bv_val ? "=" : "",
-				val.bv_val ? val.bv_val : "",
-				accessmask2str( mask, accessmaskbuf ) );
+		if ( accessstr ) {
+			fprintf( stderr, "%s access to %s%s%s: %s\n",
+					accessstr,
+					desc->ad_cname.bv_val,
+					val.bv_val ? "=" : "",
+					val.bv_val ? val.bv_val : "",
+					rc ? "ALLOWED" : "DENIED" );
+
+		} else {
+			fprintf( stderr, "%s%s%s: %s\n",
+					desc->ad_cname.bv_val,
+					val.bv_val ? "=" : "",
+					val.bv_val ? val.bv_val : "",
+					accessmask2str( mask, accessmaskbuf ) );
+		}
+		rc = 0;
 	}
 
 destroy:;