From 76634a5d861e2caa81f194294b66d5870b1702fd Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce@redhat.com>
Date: Jan 11 2012 17:04:12 +0000
Subject: ipa-pwd-extop: do not append mkvno to krbExtraData


mkvno is actually available as part of the key material.
There is no need to store it in the krbExtraData field as it is unused there.

---

diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_common.c b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_common.c
index 9ccfcb4..01d7f20 100644
--- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_common.c
+++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_common.c
@@ -1403,9 +1403,8 @@ int ipapwd_set_extradata(const char *dn,
                          time_t unixtime)
 {
     Slapi_Mods *smods;
-    Slapi_Value *va[3] = { NULL };
+    Slapi_Value *va[2] = { NULL };
     struct berval bv;
-    char mkvno[4] = { 0x00, 0x08, 0x01, 0x00 };
     char *xdata;
     int xd_len;
     int p_len;
@@ -1420,11 +1419,6 @@ int ipapwd_set_extradata(const char *dn,
 
     smods = slapi_mods_new();
 
-    /* always append a master key kvno of 1 for now */
-    bv.bv_val = mkvno;
-    bv.bv_len = 4;
-    va[0] = slapi_value_new_berval(&bv);
-
     /* data type id */
     xdata[0] = 0x00;
     xdata[1] = 0x02;
@@ -1442,13 +1436,12 @@ int ipapwd_set_extradata(const char *dn,
 
     bv.bv_val = xdata;
     bv.bv_len = xd_len;
-    va[1] = slapi_value_new_berval(&bv);
+    va[0] = slapi_value_new_berval(&bv);
 
     slapi_mods_add_mod_values(smods, LDAP_MOD_REPLACE, "krbExtraData", va);
 
     ret = ipapwd_apply_mods(dn, smods);
 
-    slapi_value_free(&va[1]);
     slapi_value_free(&va[0]);
     slapi_mods_free(&smods);