diff --git a/admin/ank.c b/admin/ank.c index 90357b91a..a2cd145d9 100644 --- a/admin/ank.c +++ b/admin/ank.c @@ -97,12 +97,11 @@ doit2(HDB *db, hdb_entry *ent, int mod) { time_t t; if(ent->max_life){ - char *p; - asprintf(&p, "%d seconds", *ent->max_life); - t = gettime ("Max ticket life", p, 1); - free(p); + char buf[128]; + unparse_time (*ent->max_life, buf, sizeof(buf)); + t = gettime ("Max ticket life", buf); }else{ - t = gettime ("Max ticket life", "unlimited", 1); + t = gettime ("Max ticket life", "unlimited"); } if(t){ if(ent->max_life == NULL) @@ -113,12 +112,11 @@ doit2(HDB *db, hdb_entry *ent, int mod) ent->max_life = NULL; } if(ent->max_renew){ - char *p; - asprintf(&p, "%d seconds", *ent->max_renew); - t = gettime ("Max renewable life", p, 1); - free(p); + char buf[128]; + unparse_time (*ent->max_renew, buf, sizeof(buf)); + t = gettime ("Max renewable life", buf); }else{ - t = gettime ("Max renewable life", "unlimited", 1); + t = gettime ("Max renewable life", "unlimited"); } if(t){ if(ent->max_renew == NULL) @@ -207,7 +205,7 @@ add_new_key(int argc, char **argv) { if(argc != 2){ fprintf(stderr, "Usage: add_new_key principal\n"); - return; + return 0; } doit(argv[1], 0); @@ -219,7 +217,7 @@ mod_entry(int argc, char **argv) { if(argc != 2){ fprintf(stderr, "Usage: mod_entry principal\n"); - return; + return 0; } doit(argv[1], 1); diff --git a/admin/init.c b/admin/init.c index a0277a5b7..209e6bc2d 100644 --- a/admin/init.c +++ b/admin/init.c @@ -109,11 +109,10 @@ init(int argc, char **argv) return 0; } - max_life = gettime("Realm max ticket life", "infinite", 1); - max_renew = gettime("Realm max renewable ticket life", "infinite", 1); - default_life = gettime("Default ticket life", "1 day", 1); - default_renew = gettime("Default renewable ticket life", "7 days", 1); - + max_life = gettime("Realm max ticket life", "infinite"); + max_renew = gettime("Realm max renewable ticket life", "infinite"); + default_life = gettime("Default ticket life", "1 day"); + default_renew = gettime("Default renewable ticket life", "7 days"); /* Create `krbtgt/REALM' */ init_des_key(&ent); diff --git a/kadmin/init.c b/kadmin/init.c index a0277a5b7..209e6bc2d 100644 --- a/kadmin/init.c +++ b/kadmin/init.c @@ -109,11 +109,10 @@ init(int argc, char **argv) return 0; } - max_life = gettime("Realm max ticket life", "infinite", 1); - max_renew = gettime("Realm max renewable ticket life", "infinite", 1); - default_life = gettime("Default ticket life", "1 day", 1); - default_renew = gettime("Default renewable ticket life", "7 days", 1); - + max_life = gettime("Realm max ticket life", "infinite"); + max_renew = gettime("Realm max renewable ticket life", "infinite"); + default_life = gettime("Default ticket life", "1 day"); + default_renew = gettime("Default renewable ticket life", "7 days"); /* Create `krbtgt/REALM' */ init_des_key(&ent);