add logs; fix bug in group/dn selection logic

[openldap] / servers / slapd / slapcommon.h

diff --git a/servers/slapd/slapcommon.h b/servers/slapd/slapcommon.h
index fdeb68a1a461b7ade2e57e96e4a2358d81046e7f..ff29921cd1c54dcc9c2499bdf8fcc616e88ddd3d 100644 (file)
--- a/servers/slapd/slapcommon.h
+++ b/servers/slapd/slapcommon.h
@@ -23,8 +23,12 @@
 enum slaptool {
        SLAPADD=1,      /* LDIF -> database tool */
        SLAPCAT,        /* database -> LDIF tool */
+       SLAPDN,         /* DN check w/ syntax tool */
        SLAPINDEX,      /* database index tool */
-       SLAPPASSWD      /* password generation tool */
+       SLAPPASSWD,     /* password generation tool */
+       SLAPTEST,       /* slapd.conf test tool */
+       SLAPAUTH,       /* test authz-regexp and authc/authz stuff */
+       SLAPLAST
 };
 
 #define SLAP_TOOL_CTXCSN_KEEP  0
@@ -47,6 +51,8 @@ typedef struct tool_vars {
        int tv_dryrun;
        struct berval tv_sub_ndn;
        FILE    *tv_ldiffp;
+       struct berval tv_authcID;
+       struct berval tv_authzID;
 } tool_vars;
 
 extern tool_vars tool_globals;
@@ -66,6 +72,8 @@ extern tool_vars tool_globals;
 #define dryrun tool_globals.tv_dryrun
 #define sub_ndn tool_globals.tv_sub_ndn
 #define ldiffp tool_globals.tv_ldiffp
+#define authcID tool_globals.tv_authcID
+#define authzID tool_globals.tv_authzID
 
 void slap_tool_init LDAP_P((
        const char* name,