From 45fbb9045b43a8ff9a6456bc0c25ae657d84ab31 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Tue, 4 May 1999 18:42:43 +0000
Subject: [PATCH] call new _kadm5_setup_entry

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6131 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/kadm5/create_s.c | 10 ++++++----
 lib/kadm5/modify_s.c |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/kadm5/create_s.c b/lib/kadm5/create_s.c
index 97e3413c1..af01f7615 100644
--- a/lib/kadm5/create_s.c
+++ b/lib/kadm5/create_s.c
@@ -68,6 +68,7 @@ create_principal(kadm5_server_context *context,
 {
     kadm5_ret_t ret;
     kadm5_principal_ent_rec defrec, *defent;
+    u_int32_t def_mask;
     
     if((mask & required_mask) != required_mask)
 	return KADM5_BAD_MASK;
@@ -86,10 +87,11 @@ create_principal(kadm5_server_context *context,
     ret = get_default(context, princ->principal, defent);
     if(ret)
 	defent = NULL;
-    ret = _kadm5_setup_entry(ent, princ, defent,
-			     mask | KADM5_ATTRIBUTES
-			     | KADM5_MAX_LIFE
-			     | KADM5_MAX_RLIFE);
+    def_mask = KADM5_ATTRIBUTES | KADM5_MAX_LIFE | KADM5_MAX_RLIFE;
+
+    ret = _kadm5_setup_entry(ent, mask | def_mask,
+			     princ, mask,
+			     defent, def_mask);
     if(defent)
 	kadm5_free_principal_ent(context, defent);
     
diff --git a/lib/kadm5/modify_s.c b/lib/kadm5/modify_s.c
index adb99fc9b..8c90f5f77 100644
--- a/lib/kadm5/modify_s.c
+++ b/lib/kadm5/modify_s.c
@@ -61,7 +61,7 @@ modify_principal(void *server_handle,
     ret = context->db->fetch(context->context, context->db, 0, &ent);
     if(ret)
 	goto out;
-    ret = _kadm5_setup_entry(&ent, princ, NULL, mask);
+    ret = _kadm5_setup_entry(&ent, mask, princ, mask, NULL, 0);
     if(ret)
 	goto out2;
     ret = _kadm5_set_modifier(context, &ent);