From ae17739f44226d7625b0a0719aa80e4ce2558c5b Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Thu, 28 Aug 1997 22:10:13 +0000 Subject: [PATCH] (parse_hdbflags2int): use `int2flags' git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3233 ec53bebd-3082-4978-b11e-865c3cabbd6b --- admin/load.c | 27 ++++----------------------- kadmin/load.c | 27 ++++----------------------- 2 files changed, 8 insertions(+), 46 deletions(-) diff --git a/admin/load.c b/admin/load.c index 69f2f69c1..ab1e8c426 100644 --- a/admin/load.c +++ b/admin/load.c @@ -168,31 +168,12 @@ parse_event(Event *ev, char *str) } static HDBFlags -parse_flags(char *str) +parse_hdbflags2int(char *str) { unsigned i; - HDBFlags f; parse_integer(&i, str); - f.initial = i & 1; - i >>= 1; - f.forwardable = i & 1; - i >>= 1; - f.proxiable = i & 1; - i >>= 1; - f.renewable = i & 1; - i >>= 1; - f.postdate = i & 1; - i >>= 1; - f.server = i & 1; - i >>= 1; - f.client = i & 1; - i >>= 1; - f.invalid = i & 1; - i >>= 1; - f.require_preauth = i & 1; - i >>= 1; - f.change_pw = i & 1; - return f; + + return int2flags(i); } static void @@ -284,7 +265,7 @@ doit(char *filename, int merge) ent.max_life = parse_integer(NULL, e.max_life); ent.max_renew = parse_integer(NULL, e.max_renew); - ent.flags = parse_flags(e.flags); + ent.flags = parse_hdbflags2int(e.flags); db->store(context, db, &ent); hdb_free_entry (context, &ent); } diff --git a/kadmin/load.c b/kadmin/load.c index 69f2f69c1..ab1e8c426 100644 --- a/kadmin/load.c +++ b/kadmin/load.c @@ -168,31 +168,12 @@ parse_event(Event *ev, char *str) } static HDBFlags -parse_flags(char *str) +parse_hdbflags2int(char *str) { unsigned i; - HDBFlags f; parse_integer(&i, str); - f.initial = i & 1; - i >>= 1; - f.forwardable = i & 1; - i >>= 1; - f.proxiable = i & 1; - i >>= 1; - f.renewable = i & 1; - i >>= 1; - f.postdate = i & 1; - i >>= 1; - f.server = i & 1; - i >>= 1; - f.client = i & 1; - i >>= 1; - f.invalid = i & 1; - i >>= 1; - f.require_preauth = i & 1; - i >>= 1; - f.change_pw = i & 1; - return f; + + return int2flags(i); } static void @@ -284,7 +265,7 @@ doit(char *filename, int merge) ent.max_life = parse_integer(NULL, e.max_life); ent.max_renew = parse_integer(NULL, e.max_renew); - ent.flags = parse_flags(e.flags); + ent.flags = parse_hdbflags2int(e.flags); db->store(context, db, &ent); hdb_free_entry (context, &ent); }