X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslapcommon.h;h=a5da19eb763510b2a178679a7b0ed37196ed4a82;hb=1939ed3fc29d0d1c01a0a9390d2c51ac2a85260f;hp=e3def431a5bc83fbc4386727886e0006e31f822c;hpb=83bb1c93cb6ed708831dd2bc9ab1f62c31845dd5;p=openldap

diff --git a/servers/slapd/slapcommon.h b/servers/slapd/slapcommon.h
index e3def431a5..a5da19eb76 100644
--- 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-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,11 +39,13 @@ typedef struct tool_vars {
 	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;
@@ -56,12 +58,14 @@ typedef struct tool_vars {
 	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;
 
 #define	be tool_globals.tv_be
 #define verbose tool_globals.tv_verbose
+#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
@@ -69,8 +73,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
@@ -83,6 +88,9 @@ extern tool_vars tool_globals;
 #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,