From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 10 May 2006 22:23:24 +0000 (+0000)
Subject: don't allow "none" as access level
X-Git-Tag: OPENLDAP_REL_ENG_2_4_1ALPHA~2^2~57
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d79fd46f336db99743c436a2bc6ab27b8a26ffdd;p=openldap

don't allow "none" as access level
---

diff --git a/servers/slapd/slapacl.c b/servers/slapd/slapacl.c
index f0a0a0580a..c7b6c274cf 100644
--- a/servers/slapd/slapacl.c
+++ b/servers/slapd/slapacl.c
@@ -313,12 +313,26 @@ slapacl( int argc, char **argv )
 
 		accessstr = strchr( attr, '/' );
 		if ( accessstr != NULL ) {
+			int	invalid = 0;
+
 			accessstr[0] = '\0';
 			accessstr++;
 			access = str2access( accessstr );
-			if ( access == ACL_INVALID_ACCESS ) {
+			switch ( access ) {
+			case ACL_INVALID_ACCESS:
 				fprintf( stderr, "unknown access \"%s\" for attribute \"%s\"\n",
 						accessstr, attr );
+				invalid = 1;
+				break;
+
+			case ACL_NONE:
+				fprintf( stderr, "\"none\" not allowed for attribute \"%s\"\n",
+						attr );
+				invalid = 1;
+				break;
+			}
+
+			if ( invalid ) {
 				if ( continuemode ) {
 					continue;
 				}