Do not require ac/string.h for lber_pvt.h

[openldap] / include / ldap.h

diff --git a/include/ldap.h b/include/ldap.h
index 824c50e4f9b674fbd2e95a21d32df62104dec3c5..1d42f0d05561995f87da9a1d479d51e6826a424d 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  * 
- * Copyright 1998-2014 The OpenLDAP Foundation.
+ * Copyright 1998-2018 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -162,6 +162,10 @@ LDAP_BEGIN_DECL
 #define LDAP_OPT_X_TLS_VERSION         0x6013  /* read-only */
 #define LDAP_OPT_X_TLS_CIPHER          0x6014  /* read-only */
 #define LDAP_OPT_X_TLS_PEERCERT                0x6015  /* read-only */
+#define LDAP_OPT_X_TLS_CACERT          0x6016
+#define LDAP_OPT_X_TLS_CERT                    0x6017
+#define LDAP_OPT_X_TLS_KEY                     0x6018
+#define LDAP_OPT_X_TLS_PEERKEY_HASH    0x6019
 
 #define LDAP_OPT_X_TLS_NEVER   0
 #define LDAP_OPT_X_TLS_HARD            1
@@ -332,6 +336,7 @@ typedef struct ldapcontrol {
 #define LDAP_REFERRALS_REQUIRED                                3
 
 /* MS Active Directory controls (for compatibility) */
+#define LDAP_CONTROL_X_LAZY_COMMIT                     "1.2.840.113556.1.4.619"
 #define LDAP_CONTROL_X_INCREMENTAL_VALUES      "1.2.840.113556.1.4.802"
 #define LDAP_CONTROL_X_DOMAIN_SCOPE                    "1.2.840.113556.1.4.1339"
 #define LDAP_CONTROL_X_PERMISSIVE_MODIFY       "1.2.840.113556.1.4.1413"
@@ -1544,6 +1549,9 @@ LDAP_F( LDAP * )
 ldap_dup LDAP_P((
        LDAP *old ));
 
+LDAP_F( int )
+ldap_connect( LDAP *ld );
+
 /*
  * in tls.c
  */