From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 3 Jan 2011 23:40:53 +0000 (+0000)
Subject: harmonize with specs; fix bugs in previous commit
X-Git-Tag: MIGRATION_CVS2GIT~269
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7614e03a63233ad42fd1bad6483e12687d4bbfe1;p=openldap

harmonize with specs; fix bugs in previous commit
---

diff --git a/contrib/slapd-modules/vc/vc.c b/contrib/slapd-modules/vc/vc.c
index 802e6360d5..6fdb7b8a5f 100644
--- a/contrib/slapd-modules/vc/vc.c
+++ b/contrib/slapd-modules/vc/vc.c
@@ -79,15 +79,11 @@ vc_create_response(
 
 	assert( val != NULL );
 
-	BER_BVZERO( *val );
+	*val = NULL;
 
 	ber_init2( ber, NULL, LBER_USE_DER );
 
-#ifdef TODO
 	(void)ber_printf( ber, "{is" /*}*/ , resultCode, diagnosticMessage ? diagnosticMessage : "" );
-#else
-	(void)ber_printf( ber, "{" /*}*/ );
-#endif
 
 	if ( conn ) {
 		struct berval cookie;
@@ -101,11 +97,12 @@ vc_create_response(
 		ber_printf( ber, "tO", LDAP_TAG_EXOP_VERIFY_CREDENTIALS_SCREDS, servercred ); 
 	}
 
+#if 0
 	if ( authzid ) {
 		ber_printf( ber, "tO", LDAP_TAG_EXOP_VERIFY_CREDENTIALS_AUTHZID, authzid ); 
 	}
+#endif
 
-#ifdef TODO
 	if ( ctrls ) {
 		int c;
 
@@ -132,7 +129,6 @@ vc_create_response(
 		rc = ber_printf( ber, /*{*/"N}" );
 		if ( rc == -1 ) goto done;
 	}
-#endif
 
 	ber_printf( ber, /*{*/ "}" );
 
@@ -295,7 +291,6 @@ vc_exop(
 			"%s VERIFYCREDENTIALS", op->o_log_prefix );
 	}
 
-#ifdef TODO
 	/* TODO: controls */
 	tag = ber_peek_tag( ber, &len );
 	if ( tag == LDAP_TAG_EXOP_VERIFY_CREDENTIALS_CONTROLS ) {
@@ -307,7 +302,6 @@ vc_exop(
 			goto done;
 		}
 	}
-#endif
 
 	tag = ber_skip_tag( ber, &len );
 	if ( len || tag != LBER_DEFAULT ) {