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 0fc4f09e1554cc22c2e5f0a2015f4e7f38262763..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-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,6 +34,7 @@ enum slaptool {
 
 typedef struct tool_vars {
        Backend *tv_be;
+       int tv_dbnum;
        int tv_verbose;
        int tv_quiet;
        int tv_update_ctxcsn;
@@ -60,11 +61,13 @@ 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
@@ -91,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)
 
@@ -99,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_ */