From a5e0e1f8504e3b81bf50c39296e301f1f94f6b0b Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Sun, 23 May 1999 06:44:19 +0000 Subject: [PATCH] (create_random_entry): more correct setting of mask git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6279 ec53bebd-3082-4978-b11e-865c3cabbd6b --- kadmin/init.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/kadmin/init.c b/kadmin/init.c index 30a6efeeb..7ddc03487 100644 --- a/kadmin/init.c +++ b/kadmin/init.c @@ -42,7 +42,9 @@ RCSID("$Id$"); static kadm5_ret_t -create_random_entry(krb5_principal princ, time_t max_life, time_t max_rlife, +create_random_entry(krb5_principal princ, + unsigned max_life, + unsigned max_rlife, u_int32_t attributes) { kadm5_principal_ent_rec ent; @@ -54,10 +56,14 @@ create_random_entry(krb5_principal princ, time_t max_life, time_t max_rlife, memset(&ent, 0, sizeof(ent)); ent.principal = princ; mask |= KADM5_PRINCIPAL; - ent.max_life = max_life; - mask |= KADM5_MAX_LIFE; - ent.max_renewable_life = max_rlife; - mask |= KADM5_MAX_RLIFE; + if (max_life) { + ent.max_life = max_life; + mask |= KADM5_MAX_LIFE; + } + if (max_rlife) { + ent.max_renewable_life = max_rlife; + mask |= KADM5_MAX_RLIFE; + } ent.attributes |= attributes | KRB5_KDB_DISALLOW_ALL_TIX; mask |= KADM5_ATTRIBUTES;