From: Hallvard Furuseth <hallvard@openldap.org>
Date: Mon, 4 Jul 2005 06:25:02 +0000 (+0000)
Subject: Format fix: Make style_strings[] global for debug output in dynacl_aci_parse()
X-Git-Tag: OPENLDAP_AC_BP~457
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a1e27aae402daa2aca3795def972d296378ff1a6;p=openldap

Format fix: Make style_strings[] global for debug output in dynacl_aci_parse()
---

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 89b69b96e9..9fb688e869 100644
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -3173,7 +3173,7 @@ dynacl_aci_parse( const char *fname, int lineno, slap_style_t sty, const char *r
 	if ( sty != ACL_STYLE_REGEX && sty != ACL_STYLE_BASE ) {
 		fprintf( stderr, "%s: line %d: "
 			"inappropriate style \"%s\" in \"aci\" by clause\n",
-			fname, lineno, sty );
+			fname, lineno, style_strings[sty] );
 		return -1;
 	}
 
diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 01688dcb8d..0bb49173d0 100644
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -39,7 +39,7 @@
 #include "lutil.h"
 
 static const char style_base[] = "base";
-static char *style_strings[] = {
+char *style_strings[] = {
 	"regex",
 	"expand",
 	"exact",
diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index ee12a59ec3..b457ea2b04 100644
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -74,6 +74,8 @@ LDAP_SLAPD_F (int) acl_init LDAP_P(( void ));
 /*
  * aclparse.c
  */
+LDAP_SLAPD_V (char *) style_strings[];
+
 LDAP_SLAPD_F (void) parse_acl LDAP_P(( Backend *be,
 	const char *fname, int lineno,
 	int argc, char **argv, int pos ));