Update slapd to use lutil_passwd() for both user and root passwords.

[openldap] / include / ldap.h

diff --git a/include/ldap.h b/include/ldap.h
index c2501db475727614f87b6622ce9653516522cf16..5a53ef2c1da2592590d5b6388767ffcb2f07a8e1 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -37,6 +37,9 @@ LDAP_BEGIN_DECL
 /* We'll eventually release as 200 */
 #define LDAP_VENDOR_VERSION    190
 
+/* include LDAP_API_FEATURE defines */
+#include <ldap_features.h>
+
 #define LDAP_COMPAT20
 #define LDAP_COMPAT30
 #if defined(LDAP_COMPAT20) || defined(LDAP_COMPAT30)
@@ -306,7 +309,7 @@ typedef struct ldapmsg LDAPMessage;
 #define NULLMSG        ((LDAPMessage *) NULL)
 
 
-#ifdef LDAP_REFERRALS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
 /*
  * structure for tracking LDAP server host, ports, DNs, etc.
  */
@@ -359,7 +362,7 @@ typedef struct ldapreq {
        struct ldapreq  *lr_prev;       /* previous request */
        struct ldapreq  *lr_next;       /* next request */
 } LDAPRequest;
-#endif /* LDAP_REFERRALS */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
 
 
 /*
@@ -467,9 +470,13 @@ typedef struct ldap_url_desc {
 /* avoid pulling in headers */
 struct timeval;
 
+/*
+ * in options.c:
+ */
 LDAP_F int ldap_get_option LDAP_P((LDAP *ld, int option, void *outvalue));
 LDAP_F int ldap_set_option LDAP_P((LDAP *ld, int option, void *invalue));
 
+/* Not yet */
 LDAP_F void ldap_control_free LDAP_P(( LDAPControl *ctrl ));
 LDAP_F void ldap_controls_free LDAP_P(( LDAPControl **ctrls ));
   
@@ -689,10 +696,11 @@ LDAP_F void cldap_setretryinfo LDAP_P(( LDAP *ld, int tries, int timeout ));
  * in sort.c
  */
 LDAP_F int ldap_sort_entries LDAP_P(( LDAP *ld,
-       LDAPMessage **chain, char *attr, int (*cmp) () ));
+       LDAPMessage **chain, char *attr,
+       int (*cmp) (const char *, const char *) ));
 LDAP_F int ldap_sort_values LDAP_P(( LDAP *ld,
-       char **vals, int (*cmp) LDAP_P((const void *, const void *)) ));
-LDAP_F int ldap_sort_strcasecmp LDAP_P(( char **a, char **b ));
+       char **vals, int (*cmp) (const void *, const void *) ));
+LDAP_F int ldap_sort_strcasecmp LDAP_P(( const void *a, const void *b ));
 
 
 /*