Add ldap_*2name() in <include,libldap>/schema, use them in slapd/schema

[openldap] / servers / slapd / slap.h

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index d114732e487a5553656c9b61675e4c6065cfa0a2..4792c0bb418109924d9008c5c2d23ff52f77ddd4 100644 (file)
--- 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
@@ -141,6 +149,8 @@ typedef struct slap_filter {
                        char    *f_un_sub_final;
                } f_un_sub;
        } f_un;
+
+#define f_dn           f_un.f_un_type  /* used for DN indices */
 #define f_type         f_un.f_un_type
 #define f_ava          f_un.f_un_ava
 #define f_avtype       f_un.f_un_ava.ava_type
@@ -612,6 +622,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 */