From: Pierangelo Masarati <ando@openldap.org>
Date: Tue, 6 Sep 2005 14:26:53 +0000 (+0000)
Subject: cleanup dynacl usage()
X-Git-Tag: OPENLDAP_REL_ENG_2_2_MP~474
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=82af0c95f7920e98ec019cd15bb9dd0ad1b3ea99;p=openldap

cleanup dynacl usage()
---

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index e307b550c5..258917a639 100644
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -2131,12 +2131,13 @@ acl_usage( void )
 			"\t[group[/<objectclass>[/<attrname>]][.<style>]=<group>]\n"
 			"\t[peername[.<peernamestyle>]=<peer>] [sockname[.<style>]=<name>]\n"
 			"\t[domain[.<domainstyle>]=<domain>] [sockurl[.<style>]=<url>]\n"
-#ifdef SLAPD_ACI_ENABLED
-			"\t[aci[=<attrname>]]\n"
-#endif
 #ifdef SLAP_DYNACL
 			"\t[dynacl/<name>[/<options>][.<dynstyle>][=<pattern>]]\n"
-#endif /* SLAP_DYNACL */
+#else /* ! SLAP_DYNACL */
+#ifdef SLAPD_ACI_ENABLED
+			"\t[aci[=<attrname>]]\n"
+#endif /* SLAPD_ACI_ENABLED */
+#endif /* ! SLAP_DYNACL */
 			"\t[ssf=<n>] [transport_ssf=<n>] [tls_ssf=<n>] [sasl_ssf=<n>]\n",
 		"<style> ::= exact | regex | base(Object)\n"
 		"<dnstyle> ::= base(Object) | one(level) | sub(tree) | children | "
@@ -2149,6 +2150,12 @@ acl_usage( void )
 		"<level> ::= none|disclose|auth|compare|search|read|{write|add|delete}|manage\n"
 		"<priv> ::= {=|+|-}{0|d|x|c|s|r|{w|a|z}|m}+\n"
 		"<control> ::= [ stop | continue | break ]\n"
+#ifdef SLAP_DYNACL
+#ifdef SLAPD_ACI_ENABLED
+		"dynacl:\n"
+		"\t<name>=ACI\t<pattern>=<attrname>\n"
+#endif /* SLAPD_ACI_ENABLED */
+#endif /* ! SLAP_DYNACL */
 	);
 	exit( EXIT_FAILURE );
 }