From: Howard Chu <hyc@openldap.org>
Date: Mon, 25 Jul 2022 16:14:07 +0000 (+0100)
Subject: Add nonstd cbind SASL secprop
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d47f212679146eabf157f8d03bbb0be579cb8bf4;p=thirdparty%2Fopenldap.git

Add nonstd cbind SASL secprop

For Cyrus SASL 2.2, https://github.com/cyrusimap/cyrus-sasl/commit/8735185e9d5550e0f11e1ce4b77e391a16e4145b
---

diff --git a/doc/man/man3/ldap_get_option.3 b/doc/man/man3/ldap_get_option.3
index e6b0580da1..b7ed9762e3 100644
--- a/doc/man/man3/ldap_get_option.3
+++ b/doc/man/man3/ldap_get_option.3
@@ -545,6 +545,7 @@ Legal values are:
 .BR passcred ,
 .BR forwardsec ,
 .BR noanonymous ,
+.BR nonstdcbind ,
 .BR minssf=<minssf> ,
 .BR maxssf=<maxssf> ,
 .BR maxbufsize=<maxbufsize> .
diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index cc925d349d..a227f9651d 100644
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -821,6 +821,9 @@ static struct {
 	{ BER_BVC("passcred"), SASL_SEC_PASS_CREDENTIALS, 0, 0 },
 	{ BER_BVC("forwardsec"), SASL_SEC_FORWARD_SECRECY, 0, 0 },
 	{ BER_BVC("noanonymous"), SASL_SEC_NOANONYMOUS, 0, 0 },
+#ifdef SASL_SEC_NONSTD_CBIND
+	{ BER_BVC("nonstdcbind"), SASL_SEC_NONSTD_CBIND, 0, 0 },
+#endif
 	{ BER_BVC("minssf="), 0, GOT_MINSSF, 0 },
 	{ BER_BVC("maxssf="), 0, GOT_MAXSSF, INT_MAX },
 	{ BER_BVC("maxbufsize="), 0, GOT_MAXBUF, 65536 },