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

(_kadm5_setup_entry): handle 0 == unlimited correctly. From Michal

Browse Source 
Vocu <michal@karlin.mff.cuni.cz>


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6350 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-06-23 11:55:24 +00:00
parent 2a50031890
commit 7d1092fd56
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/kadm5/ent_setup.c
View File

@@ -41,6 +41,7 @@
RCSID("$Id$"); RCSID("$Id$");
#define set_value(X, V) do { if((X) == NULL) (X) = malloc(sizeof(*(X))); *(X) = V; } while(0) #define set_value(X, V) do { if((X) == NULL) (X) = malloc(sizeof(*(X))); *(X) = V; } while(0)
#define set_null(X) do { if((X) != NULL) free((X)); (X) = NULL; } while (0)
static void static void
attr_to_flags(unsigned attr, HDBFlags *flags) attr_to_flags(unsigned attr, HDBFlags *flags)
@@ -96,18 +97,30 @@ _kadm5_setup_entry(hdb_entry *ent,
} }
if(mask & KADM5_MAX_LIFE) { if(mask & KADM5_MAX_LIFE) {
if(princ_mask & KADM5_MAX_LIFE) if(princ_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
set_null(ent->max_life);
else if(def_mask & KADM5_MAX_LIFE) else if(def_mask & KADM5_MAX_LIFE)
set_value(ent->max_life, def->max_life); if(def->max_life)
set_value(ent->max_life, def->max_life);
else
set_null(ent->max_life);
} }
if(mask & KADM5_KVNO if(mask & KADM5_KVNO
&& princ_mask & KADM5_KVNO) && princ_mask & KADM5_KVNO)
ent->kvno = princ->kvno; ent->kvno = princ->kvno;
if(mask & KADM5_MAX_RLIFE) { if(mask & KADM5_MAX_RLIFE) {
if(princ_mask & KADM5_MAX_RLIFE) if(princ_mask & KADM5_MAX_RLIFE)
if(princ->max_renewable_life)
set_value(ent->max_renew, princ->max_renewable_life); set_value(ent->max_renew, princ->max_renewable_life);
else
set_null(ent->max_renew);
else if(def_mask & KADM5_MAX_RLIFE) else if(def_mask & KADM5_MAX_RLIFE)
if(def->max_renewable_life)
set_value(ent->max_renew, def->max_renewable_life); set_value(ent->max_renew, def->max_renewable_life);
else
set_null(ent->max_renew);
} }
if(mask & KADM5_KEY_DATA if(mask & KADM5_KEY_DATA
&& princ_mask & KADM5_KEY_DATA) { && princ_mask & KADM5_KEY_DATA) {