remove all referral specific code; now referrals can be used by defining appropriate...

[openldap] / servers / slapd / slapcommon.h

diff --git a/servers/slapd/slapcommon.h b/servers/slapd/slapcommon.h
index ff29921cd1c54dcc9c2499bdf8fcc616e88ddd3d..8d6c94113f754deade7c5e746a0a1d351735f17c 100644 (file)
--- a/servers/slapd/slapcommon.h
+++ b/servers/slapd/slapcommon.h
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,31 +28,26 @@ enum slaptool {
        SLAPPASSWD,     /* password generation tool */
        SLAPTEST,       /* slapd.conf test tool */
        SLAPAUTH,       /* test authz-regexp and authc/authz stuff */
+       SLAPACL,        /* test acl */
        SLAPLAST
 };
 
-#define SLAP_TOOL_CTXCSN_KEEP  0
-#define SLAP_TOOL_CTXCSN_ENTRY 1
-#define SLAP_TOOL_CTXCSN_BATCH 2
-
 typedef struct tool_vars {
        Backend *tv_be;
        int tv_verbose;
        int tv_update_ctxcsn;
-       int tv_retrieve_ctxcsn;
-       int tv_retrieve_synccookie;
-       int tv_replica_promotion;
-       int tv_replica_demotion;
-       char    *tv_replica_id_string;
-       char    **tv_replica_id_strlist;
-       int     *tv_replica_id_list;
        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;
@@ -60,20 +55,18 @@ extern tool_vars tool_globals;
 #define        be tool_globals.tv_be
 #define verbose tool_globals.tv_verbose
 #define update_ctxcsn tool_globals.tv_update_ctxcsn
-#define retrieve_ctxcsn tool_globals.tv_retrieve_ctxcsn
-#define retrieve_synccookie tool_globals.tv_retrieve_synccookie
-#define replica_promotion tool_globals.tv_replica_promotion
-#define replica_demotion tool_globals.tv_replica_demotion
-#define replica_id_string tool_globals.tv_replica_id_string
-#define replica_id_strlist tool_globals.tv_replica_id_strlist
-#define replica_id_list tool_globals.tv_replica_id_list
 #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,