merge fixes for ITS#4419,ITS#4429

[openldap] / servers / slapd / slapcommon.h

diff --git a/servers/slapd/slapcommon.h b/servers/slapd/slapcommon.h
index 41fca6f4fba5598d6746c4d6c1554a2b6e8e341c..9584986915b176593b9115090fac21393b9c07df 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-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,30 +32,32 @@ enum slaptool {
        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 LDIFFP   *tv_ldiffp;
        struct berval tv_baseDN;
+       struct berval tv_authcDN;
+       struct berval tv_authzDN;
        struct berval tv_authcID;
        struct berval tv_authzID;
+       struct berval tv_mech;
+       char    *tv_realm;
+       struct berval tv_listener_url;
+       struct berval tv_peer_domain;
+       struct berval tv_peer_name;
+       struct berval tv_sock_name;
+       slap_ssf_t tv_ssf;
+       slap_ssf_t tv_transport_ssf;
+       slap_ssf_t tv_tls_ssf;
+       slap_ssf_t tv_sasl_ssf;
+       unsigned tv_dn_mode;
 } tool_vars;
 
 extern tool_vars tool_globals;
@@ -63,22 +65,30 @@ 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 authcDN tool_globals.tv_authcDN
+#define authzDN tool_globals.tv_authzDN
 #define authcID tool_globals.tv_authcID
 #define authzID tool_globals.tv_authzID
+#define mech tool_globals.tv_mech
+#define realm tool_globals.tv_realm
+#define listener_url tool_globals.tv_listener_url
+#define peer_domain tool_globals.tv_peer_domain
+#define peer_name tool_globals.tv_peer_name
+#define sock_name tool_globals.tv_sock_name
+#define ssf tool_globals.tv_ssf
+#define transport_ssf tool_globals.tv_transport_ssf
+#define tls_ssf tool_globals.tv_tls_ssf
+#define sasl_ssf tool_globals.tv_sasl_ssf
+#define dn_mode tool_globals.tv_dn_mode
+#define SLAP_TOOL_LDAPDN_PRETTY                SLAP_LDAPDN_PRETTY
+#define SLAP_TOOL_LDAPDN_NORMAL                (SLAP_LDAPDN_PRETTY << 1)
 
 void slap_tool_init LDAP_P((
        const char* name,