ITS#6437, move structs slab_object and slab_heap from slap.h to sl_malloc.c

[openldap] / servers / slapd / slapcommon.h

diff --git a/servers/slapd/slapcommon.h b/servers/slapd/slapcommon.h
index d354652e26fad6d14da34829cad63342652ff95a..b5de462cb05c702abb2528b25c34e1c3e27276a4 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-2010 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,8 +43,9 @@ typedef struct tool_vars {
        int tv_nosubordinates;
        int tv_dryrun;
        int tv_jumpline;
-       Filter *tv_filter;
        struct berval tv_sub_ndn;
+       int tv_scope;
+       Filter *tv_filter;
        struct LDIFFP   *tv_ldiffp;
        struct berval tv_baseDN;
        struct berval tv_authcDN;
@@ -63,6 +64,7 @@ typedef struct tool_vars {
        slap_ssf_t tv_sasl_ssf;
        unsigned tv_dn_mode;
        unsigned int tv_csnsid;
+       ber_len_t tv_ldif_wrap;
 } tool_vars;
 
 extern tool_vars tool_globals;
@@ -76,8 +78,9 @@ extern tool_vars tool_globals;
 #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 scope tool_globals.tv_scope
+#define filter tool_globals.tv_filter
 #define ldiffp tool_globals.tv_ldiffp
 #define baseDN tool_globals.tv_baseDN
 #define authcDN tool_globals.tv_authcDN
@@ -96,6 +99,8 @@ extern tool_vars tool_globals;
 #define sasl_ssf tool_globals.tv_sasl_ssf
 #define dn_mode tool_globals.tv_dn_mode
 #define csnsid tool_globals.tv_csnsid
+#define ldif_wrap tool_globals.tv_ldif_wrap
+
 #define SLAP_TOOL_LDAPDN_PRETTY                SLAP_LDAPDN_PRETTY
 #define SLAP_TOOL_LDAPDN_NORMAL                (SLAP_LDAPDN_PRETTY << 1)