oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Break out the that we request from principal from the entry and pass

Browse Source 
it in as a seprate argument.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17309 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-04-27 11:06:57 +00:00
parent 83d3254750
commit e4adaa6783
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/kadm5/chpass_s.c
View File

@@ -49,11 +49,10 @@ change(void *server_handle,
int cmp = 1; int cmp = 1;
memset(&ent, 0, sizeof(ent)); memset(&ent, 0, sizeof(ent));
ent.entry.principal = princ;
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0); ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
if(ret) if(ret)
return 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); HDB_F_DECRYPT, &ent);
if(ret == HDB_ERR_NOENTRY) if(ret == HDB_ERR_NOENTRY)
goto out; goto out;
@@ -149,11 +148,10 @@ kadm5_s_chpass_principal_with_key(void *server_handle,
kadm5_ret_t ret; kadm5_ret_t ret;
memset(&ent, 0, sizeof(ent)); memset(&ent, 0, sizeof(ent));
ent.entry.principal = princ;
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0); ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
if(ret) if(ret)
return 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) if(ret == HDB_ERR_NOENTRY)
goto out; goto out;
ret = _kadm5_set_keys2(context, &ent.entry, n_key_data, key_data); ret = _kadm5_set_keys2(context, &ent.entry, n_key_data, key_data);