From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 4 Jan 2011 16:01:07 +0000 (+0000)
Subject: VC adjust controls tag
X-Git-Tag: MIGRATION_CVS2GIT~253
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=390ba8c84e86bd91faea24dd964d4d3f4b1c5837;p=openldap

VC adjust controls tag
---

diff --git a/include/ldap.h b/include/ldap.h
index 99ce060bcb..55ea5d7177 100644
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -393,7 +393,7 @@ typedef struct ldapcontrol {
 
 #define LDAP_TAG_EXOP_VERIFY_CREDENTIALS_COOKIE	 ((ber_tag_t) 0x80U)
 #define LDAP_TAG_EXOP_VERIFY_CREDENTIALS_SCREDS	 ((ber_tag_t) 0x81U)
-#define LDAP_TAG_EXOP_VERIFY_CREDENTIALS_CONTROLS ((ber_tag_t) 0xa3U) /* context specific + constructed + 3 */
+#define LDAP_TAG_EXOP_VERIFY_CREDENTIALS_CONTROLS ((ber_tag_t) 0xa2U) /* context specific + constructed + 2 */
 
 #define LDAP_EXOP_WHO_AM_I		"1.3.6.1.4.1.4203.1.11.3"		/* RFC 4532 */
 #define LDAP_EXOP_X_WHO_AM_I	LDAP_EXOP_WHO_AM_I
diff --git a/libraries/libldap/vc.c b/libraries/libldap/vc.c
index 03a57ceabc..44ff2fcfb3 100644
--- a/libraries/libldap/vc.c
+++ b/libraries/libldap/vc.c
@@ -35,8 +35,8 @@
  * VCRequest ::= SEQUENCE {
  *		cookie [0] OCTET STRING OPTIONAL,
  *		name	LDAPDN,
- *		authentication	AuthenticationChoice
- *	    controls [3] Controls OPTIONAL
+ *		authentication	AuthenticationChoice,
+ *	    controls [2] Controls OPTIONAL
  * }
  *
  * where LDAPDN, AuthenticationChoice, and Controls are as defined in RFC 4511.
@@ -47,8 +47,8 @@
  *		resultCode ResultCode,
  *		diagnosticMessage LDAPString,
  *		cookie [0] OCTET STRING OPTIONAL,
- *		serverSaslCreds [1] OCTET STRING OPTIONAL
- *	    controls [3] Controls OPTIONAL
+ *		serverSaslCreds [1] OCTET STRING OPTIONAL,
+ *	    controls [2] Controls OPTIONAL
  * }
  *
  * where ResultCode is the result code enumeration from RFC 4511, and LDAPString and Controls are as