call new _kadm5_setup_entry

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6131 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-05-04 18:42:43 +00:00
parent f69d7045c9
commit 45fbb9045b
2 changed files with 7 additions and 5 deletions

View File

@@ -68,6 +68,7 @@ create_principal(kadm5_server_context *context,
{ {
kadm5_ret_t ret; kadm5_ret_t ret;
kadm5_principal_ent_rec defrec, *defent; kadm5_principal_ent_rec defrec, *defent;
u_int32_t def_mask;
if((mask & required_mask) != required_mask) if((mask & required_mask) != required_mask)
return KADM5_BAD_MASK; return KADM5_BAD_MASK;
@@ -86,10 +87,11 @@ create_principal(kadm5_server_context *context,
ret = get_default(context, princ->principal, defent); ret = get_default(context, princ->principal, defent);
if(ret) if(ret)
defent = NULL; defent = NULL;
ret = _kadm5_setup_entry(ent, princ, defent, def_mask = KADM5_ATTRIBUTES | KADM5_MAX_LIFE | KADM5_MAX_RLIFE;
mask | KADM5_ATTRIBUTES
| KADM5_MAX_LIFE ret = _kadm5_setup_entry(ent, mask | def_mask,
| KADM5_MAX_RLIFE); princ, mask,
defent, def_mask);
if(defent) if(defent)
kadm5_free_principal_ent(context, defent); kadm5_free_principal_ent(context, defent);

View File

@@ -61,7 +61,7 @@ modify_principal(void *server_handle,
ret = context->db->fetch(context->context, context->db, 0, &ent); ret = context->db->fetch(context->context, context->db, 0, &ent);
if(ret) if(ret)
goto out; goto out;
ret = _kadm5_setup_entry(&ent, princ, NULL, mask); ret = _kadm5_setup_entry(&ent, mask, princ, mask, NULL, 0);
if(ret) if(ret)
goto out2; goto out2;
ret = _kadm5_set_modifier(context, &ent); ret = _kadm5_set_modifier(context, &ent);