Fix ITS#3424

[openldap] / servers / slapd / slapcommon.h

diff --git a/servers/slapd/slapcommon.h b/servers/slapd/slapcommon.h
index ff29921cd1c54dcc9c2499bdf8fcc616e88ddd3d..ab3d0aa0c3c14f0d9c31a610a6b19510ed8d41e8 100644 (file)
--- a/servers/slapd/slapcommon.h
+++ b/servers/slapd/slapcommon.h
@@ -28,6 +28,7 @@ enum slaptool {
        SLAPPASSWD,     /* password generation tool */
        SLAPTEST,       /* slapd.conf test tool */
        SLAPAUTH,       /* test authz-regexp and authc/authz stuff */
+       SLAPACL,        /* test acl */
        SLAPLAST
 };
 
@@ -49,10 +50,15 @@ typedef struct tool_vars {
        int tv_continuemode;
        int tv_nosubordinates;
        int tv_dryrun;
+       Filter *tv_filter;
        struct berval tv_sub_ndn;
        FILE    *tv_ldiffp;
+       struct berval tv_authcDN;
+       struct berval tv_baseDN;
        struct berval tv_authcID;
        struct berval tv_authzID;
+       struct berval tv_mech;
+       char    *tv_realm;
 } tool_vars;
 
 extern tool_vars tool_globals;
@@ -70,10 +76,15 @@ extern tool_vars tool_globals;
 #define continuemode tool_globals.tv_continuemode
 #define nosubordinates tool_globals.tv_nosubordinates
 #define dryrun tool_globals.tv_dryrun
+#define filter tool_globals.tv_filter
 #define sub_ndn tool_globals.tv_sub_ndn
 #define ldiffp tool_globals.tv_ldiffp
+#define authcDN tool_globals.tv_authcDN
+#define baseDN tool_globals.tv_baseDN
 #define authcID tool_globals.tv_authcID
 #define authzID tool_globals.tv_authzID
+#define mech tool_globals.tv_mech
+#define realm tool_globals.tv_realm
 
 void slap_tool_init LDAP_P((
        const char* name,