From 9d6d3ee5f3177bf508027e4e8e326a11cc321f9c Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@cryptonector.com>
Date: Tue, 19 Jul 2011 14:19:38 -0500
Subject: [PATCH] Fixed a likely bug in modify_principal() where the memset()
 of ent happens after early error checking.

---
 lib/kadm5/modify_s.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/kadm5/modify_s.c b/lib/kadm5/modify_s.c
index 8d5787d5f..c55c02ee4 100644
--- a/lib/kadm5/modify_s.c
+++ b/lib/kadm5/modify_s.c
@@ -45,13 +45,14 @@ modify_principal(void *server_handle,
     hdb_entry_ex ent;
     kadm5_ret_t ret;
 
+    memset(&ent, 0, sizeof(ent));
+
     if((mask & forbidden_mask))
 	return KADM5_BAD_MASK;
     if((mask & KADM5_POLICY) && strcmp(princ->policy, "default"))
 	return KADM5_UNK_POLICY;
     }
 
-    memset(&ent, 0, sizeof(ent));
     ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
     if(ret)
 	return ret;