Always enable client. Only set max-life and max-renew if != 0.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4255 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan
|
* Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
|
||||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
@@ -56,7 +56,7 @@ attr_to_flags(unsigned attr, HDBFlags *flags)
|
|||||||
/* HW_AUTH */
|
/* HW_AUTH */
|
||||||
flags->server = !(attr & KRB5_KDB_DISALLOW_SVR);
|
flags->server = !(attr & KRB5_KDB_DISALLOW_SVR);
|
||||||
flags->change_pw = !!(attr & KRB5_KDB_PWCHANGE_SERVICE);
|
flags->change_pw = !!(attr & KRB5_KDB_PWCHANGE_SERVICE);
|
||||||
flags->client = !!(attr & KRB5_KDB_DISALLOW_SVR);
|
flags->client = 1; /* XXX */
|
||||||
}
|
}
|
||||||
|
|
||||||
kadm5_ret_t
|
kadm5_ret_t
|
||||||
@@ -79,13 +79,15 @@ _kadm5_setup_entry(hdb_entry *ent, kadm5_principal_ent_t princ,
|
|||||||
ent->flags.postdate = 1;
|
ent->flags.postdate = 1;
|
||||||
}
|
}
|
||||||
if(mask & KADM5_MAX_LIFE)
|
if(mask & KADM5_MAX_LIFE)
|
||||||
set_value(ent->max_life, princ->max_life);
|
if(princ->max_life)
|
||||||
|
set_value(ent->max_life, princ->max_life);
|
||||||
else if(def && def->max_life)
|
else if(def && def->max_life)
|
||||||
set_value(ent->max_life, def->max_life);
|
set_value(ent->max_life, def->max_life);
|
||||||
if(mask & KADM5_KVNO)
|
if(mask & KADM5_KVNO)
|
||||||
ent->kvno = princ->kvno;
|
ent->kvno = princ->kvno;
|
||||||
if(mask & KADM5_MAX_RLIFE)
|
if(mask & KADM5_MAX_RLIFE)
|
||||||
set_value(ent->max_renew, princ->max_renewable_life);
|
if(princ->max_renewable_life)
|
||||||
|
set_value(ent->max_renew, princ->max_renewable_life);
|
||||||
else if(def && def->max_renewable_life)
|
else if(def && def->max_renewable_life)
|
||||||
set_value(ent->max_renew, def->max_renewable_life);
|
set_value(ent->max_renew, def->max_renewable_life);
|
||||||
if(mask & KADM5_TL_DATA){
|
if(mask & KADM5_TL_DATA){
|
||||||
|
Reference in New Issue
Block a user