(_kadm5_setup_entry): make princ_expire_time == 0 and pw_expiration ==
0 mean never git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6499 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -75,11 +75,19 @@ _kadm5_setup_entry(hdb_entry *ent,
|
||||
u_int32_t def_mask)
|
||||
{
|
||||
if(mask & KADM5_PRINC_EXPIRE_TIME
|
||||
&& princ_mask & KADM5_PRINC_EXPIRE_TIME)
|
||||
set_value(ent->valid_end, princ->princ_expire_time);
|
||||
&& princ_mask & KADM5_PRINC_EXPIRE_TIME) {
|
||||
if (princ->princ_expire_time)
|
||||
set_value(ent->valid_end, princ->princ_expire_time);
|
||||
else
|
||||
set_null(ent->valid_end);
|
||||
}
|
||||
if(mask & KADM5_PW_EXPIRATION
|
||||
&& princ_mask & KADM5_PW_EXPIRATION)
|
||||
set_value(ent->pw_end, princ->pw_expiration);
|
||||
&& princ_mask & KADM5_PW_EXPIRATION) {
|
||||
if (princ->pw_expiration)
|
||||
set_value(ent->pw_end, princ->pw_expiration);
|
||||
else
|
||||
set_null(ent->pw_end);
|
||||
}
|
||||
if(mask & KADM5_ATTRIBUTES) {
|
||||
if (princ_mask & KADM5_ATTRIBUTES) {
|
||||
attr_to_flags(princ->attributes, &ent->flags);
|
||||
|
Reference in New Issue
Block a user