ITS#8753 Public key pinning support in libldap

[openldap] / include / ldap.h

diff --git a/include/ldap.h b/include/ldap.h
index acf6328e898a71dc092e819d4ece3c7e74413e86..2ca1b84fd6820a93b4b5aa31fdc06df4d5962474 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-2013 The OpenLDAP Foundation.
+ * Copyright 1998-2017 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"
@@ -422,11 +427,17 @@ typedef struct ldapcontrol {
 #define LDAP_URLEXT_X_SEARCHEDSUBTREE  "x-searchedSubtree"
 #define LDAP_URLEXT_X_FAILEDNAME       "x-failedName"
 
-#define LDAP_X_TXN                                             "1.3.6.1.4.1.4203.666.11.7" /* tmp */
-#define LDAP_EXOP_X_TXN_START                  LDAP_X_TXN ".1"
-#define LDAP_CONTROL_X_TXN_SPEC                        LDAP_X_TXN ".2"
-#define LDAP_EXOP_X_TXN_END                            LDAP_X_TXN ".3"
-#define LDAP_EXOP_X_TXN_ABORTED_NOTICE LDAP_X_TXN ".4"
+#define LDAP_TXN                                               "1.3.6.1.1.21" /* RFC 5805 */
+#define LDAP_EXOP_TXN_START                            LDAP_X_TXN ".1"
+#define LDAP_CONTROL_TXN_SPEC                  LDAP_X_TXN ".2"
+#define LDAP_EXOP_TXN_END                              LDAP_X_TXN ".3"
+#define LDAP_EXOP_TXN_ABORTED_NOTICE   LDAP_X_TXN ".4"
+
+#define        LDAP_X_TXN      LDAP_TXN
+#define LDAP_EXOP_X_TXN_START                  LDAP_EXOP_TXN_START
+#define LDAP_CONTROL_X_TXN_SPEC                        LDAP_CONTROL_TXN_SPEC
+#define LDAP_EXOP_X_TXN_END                            LDAP_EXOP_TXN_END
+#define LDAP_EXOP_X_TXN_ABORTED_NOTICE LDAP_EXOP_TXN_ABORTED_NOTICE
 
 /* LDAP Features */
 #define LDAP_FEATURE_ALL_OP_ATTRS      "1.3.6.1.4.1.4203.1.5.1"        /* RFC 3673 */
@@ -1538,6 +1549,9 @@ LDAP_F( LDAP * )
 ldap_dup LDAP_P((
        LDAP *old ));
 
+LDAP_F( int )
+ldap_connect( LDAP *ld );
+
 /*
  * in tls.c
  */