X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslap.h;h=56e732d5e452606182c646c4cd1e64628fc7bb12;hb=740f1b422edc48c9eeed8346c45872a63b683370;hp=2e3488f4034991f95a02f5c79a0bc5fc67bf4528;hpb=c9778dd116308b24a7206e06f65c6b537a562b8f;p=openldap

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 2e3488f403..56e732d5e4 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1,4 +1,8 @@
 /* slap.h - stand alone ldap server include file */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #ifndef _SLDAPD_H_
 #define _SLDAPD_H_
@@ -11,6 +15,10 @@
 #include <ac/socket.h>
 #include <ac/time.h>
 
+#ifdef HAVE_CYRUS_SASL
+#include <sasl.h>
+#endif
+
 #include "avl.h"
 
 #ifndef ldap_debug
@@ -20,10 +28,8 @@
 
 #include "ldap_log.h"
 
-#include "lber.h"
-#include "ldap.h"
-
-#include "ldap_schema.h"
+#include <ldap.h>
+#include <ldap_schema.h>
 
 #include "ldap_pvt_thread.h"
 #include "ldif.h"
@@ -95,6 +101,12 @@ extern int slap_debug;
 struct slap_op;
 struct slap_conn;
 
+struct replog_moddn {
+	char *newrdn;
+	int	deloldrdn;
+	char *newsup;
+};
+
 /*
  * represents an attribute value assertion (i.e., attr=value)
  */
@@ -416,6 +428,7 @@ struct slap_backend_db {
 	/* these should be renamed from be_ to bd_ */
 	char	**be_suffix;	/* the DN suffixes of data in this backend */
 	char	**be_nsuffix;	/* the normalized DN suffixes in this backend */
+	char	**be_suffixAlias; /* pairs of DN suffix aliases and deref values */
 	char	*be_root_dn;	/* the magic "root" dn for this db 	*/
 	char	*be_root_ndn;	/* the magic "root" normalized dn for this db	*/
 	char	*be_root_pw;	/* the magic "root" password for this db	*/
@@ -607,6 +620,10 @@ typedef struct slap_conn {
 	char		*c_peer_name;	/* peer name (trans=addr:port) */
 	char		*c_sock_name;	/* sock name (trans=addr:port) */
 
+#ifdef HAVE_CYRUS_SASL
+	sasl_conn_t	*c_sasl_context;
+#endif
+
 	/* only can be changed by binding thread */
 	int		c_bind_in_progress;	/* multi-op bind in progress */