make sure NULL pointers are not dereferenced

[openldap] / servers / slapd / slapcommon.h

diff --git a/servers/slapd/slapcommon.h b/servers/slapd/slapcommon.h
index e3def431a5bc83fbc4386727886e0006e31f822c..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-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,9 +41,10 @@ typedef struct tool_vars {
        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;
@@ -56,6 +57,7 @@ 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;
@@ -69,8 +71,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 +86,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,