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 89b69b96e95248afad01ed11b1fb9ba45f82c02c..9fb688e86947fac5ef52ea1c138fdaef9ff86f87 100644 (file)
--- 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 01688dcb8d635096c58fff5d4587de19c62baebe..0bb49173d09d2f490ce41943733a993df9db98d1 100644 (file)
--- 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 ee12a59ec38358731c2a21258efdd3b08b1e72c4..b457ea2b043c9c0684f9f9d71f61444038c75688 100644 (file)
--- 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 ));