Partially revert prev commit, leave rs->sr_err == SLAPD_ABANDON

[openldap] / servers / slapd / slapcommon.h

diff --git a/servers/slapd/slapcommon.h b/servers/slapd/slapcommon.h
index 423f0fbd87974357b432cae6bcd8ee11d8e11392..b030da2874768225bc1082b066be7abcac6ec4f3 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-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,16 +34,20 @@ enum slaptool {
 
 typedef struct tool_vars {
        Backend *tv_be;
+       int tv_dbnum;
        int tv_verbose;
+       int tv_quiet;
        int tv_update_ctxcsn;
        int tv_continuemode;
        int tv_nosubordinates;
        int tv_dryrun;
+       int tv_jumpline;
        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;
@@ -57,12 +61,16 @@ typedef struct tool_vars {
        slap_ssf_t tv_tls_ssf;
        slap_ssf_t tv_sasl_ssf;
        unsigned tv_dn_mode;
+       unsigned int tv_csnsid;
 } tool_vars;
 
 extern tool_vars tool_globals;
 
 #define        be tool_globals.tv_be
+#define        dbnum tool_globals.tv_dbnum
 #define verbose tool_globals.tv_verbose
+#define quiet tool_globals.tv_quiet
+#define jumpline tool_globals.tv_jumpline
 #define update_ctxcsn tool_globals.tv_update_ctxcsn
 #define continuemode tool_globals.tv_continuemode
 #define nosubordinates tool_globals.tv_nosubordinates
@@ -70,8 +78,9 @@ extern tool_vars tool_globals;
 #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
@@ -85,6 +94,7 @@ extern tool_vars tool_globals;
 #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 csnsid tool_globals.tv_csnsid
 #define SLAP_TOOL_LDAPDN_PRETTY                SLAP_LDAPDN_PRETTY
 #define SLAP_TOOL_LDAPDN_NORMAL                (SLAP_LDAPDN_PRETTY << 1)
 
@@ -93,6 +103,6 @@ void slap_tool_init LDAP_P((
        int tool,
        int argc, char **argv ));
 
-void slap_tool_destroy LDAP_P((void));
+int slap_tool_destroy LDAP_P((void));
 
 #endif /* SLAPCOMMON_H_ */