From e4adaa678304c8f908ce06d4eb47bbb8c12cd3b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Thu, 27 Apr 2006 11:06:57 +0000 Subject: [PATCH] Break out the that we request from principal from the entry and pass it in as a seprate argument. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17309 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/kadm5/chpass_s.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/kadm5/chpass_s.c b/lib/kadm5/chpass_s.c index 3458b82f4..d067f1cd3 100644 --- a/lib/kadm5/chpass_s.c +++ b/lib/kadm5/chpass_s.c @@ -49,11 +49,10 @@ change(void *server_handle, int cmp = 1; memset(&ent, 0, sizeof(ent)); - ent.entry.principal = princ; ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0); if(ret) return ret; - ret = context->db->hdb_fetch(context->context, context->db, + ret = context->db->hdb_fetch(context->context, context->db, princ, HDB_F_DECRYPT, &ent); if(ret == HDB_ERR_NOENTRY) goto out; @@ -149,11 +148,10 @@ kadm5_s_chpass_principal_with_key(void *server_handle, kadm5_ret_t ret; memset(&ent, 0, sizeof(ent)); - ent.entry.principal = princ; ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0); if(ret) return ret; - ret = context->db->hdb_fetch(context->context, context->db, 0, &ent); + ret = context->db->hdb_fetch(context->context, context->db, princ, 0, &ent); if(ret == HDB_ERR_NOENTRY) goto out; ret = _kadm5_set_keys2(context, &ent.entry, n_key_data, key_data);