X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslapacl.c;h=f0a0a0580a8e50cbbc738093a5a67d6d2654f3bb;hb=d168b49464df8a034e244c6610721155aa6b42ba;hp=d70c709c0066541b902f65ff6d53cbb89e6b50b8;hpb=ec0b3b4b3c469cd789bccefa06c2ac382b0b7ac2;p=openldap

diff --git a/servers/slapd/slapacl.c b/servers/slapd/slapacl.c
index d70c709c00..f0a0a0580a 100644
--- a/servers/slapd/slapacl.c
+++ b/servers/slapd/slapacl.c
@@ -1,6 +1,6 @@
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2004-2005 The OpenLDAP Foundation.
+ * Copyright 2004-2006 The OpenLDAP Foundation.
  * Portions Copyright 2004 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -65,8 +65,8 @@ slapacl( int argc, char **argv )
 	const char		*progname = "slapacl";
 	Connection		conn = { 0 };
 	Listener		listener;
-	char			opbuf[OPERATION_BUFFER_SIZE];
-	Operation		*op;
+	OperationBuffer	opbuf;
+	Operation		*op = NULL;
 	Entry			e = { 0 }, *ep = &e;
 	char			*attr = NULL;
 	int			doclose = 0;
@@ -94,7 +94,7 @@ slapacl( int argc, char **argv )
 	argv = &argv[ optind ];
 	argc -= optind;
 
-	op = (Operation *)opbuf;
+	op = (Operation *) &opbuf;
 	connection_fake_init( &conn, op, &conn );
 
 	conn.c_listener = &listener;
@@ -222,13 +222,22 @@ slapacl( int argc, char **argv )
 		op->o_bd = frontendDB;
 	}
 
-	if ( !dryrun && be ) {
+	if ( !dryrun ) {
 		ID	id;
 
+		if ( be == NULL ) {
+			fprintf( stderr, "%s: no target database "
+				"has been found for baseDN=\"%s\"; "
+				"you may try with \"-u\" (dry run).\n",
+				baseDN.bv_val, progname );
+			rc = 1;
+			goto destroy;
+		}
+
 		if ( !be->be_entry_open ||
 			!be->be_entry_close ||
 			!be->be_dn2id_get ||
-			!be->be_entry_get )
+			!be->be_id2entry_get )
 		{
 			fprintf( stderr, "%s: target database "
 				"doesn't support necessary operations; "