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

call new gettime

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2617 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-07-24 11:30:05 +00:00
parent 57ccb77135
commit 0e9bc9ad93
3 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
admin/ank.c
View File

@@ -97,12 +97,11 @@ doit2(HDB *db, hdb_entry *ent, int mod)
{ {
time_t t; time_t t;
if(ent->max_life){ if(ent->max_life){
char *p; char buf[128];
asprintf(&p, "%d seconds", *ent->max_life); unparse_time (*ent->max_life, buf, sizeof(buf));
t = gettime ("Max ticket life", p, 1); t = gettime ("Max ticket life", buf);
free(p);
}else{ }else{
t = gettime ("Max ticket life", "unlimited", 1); t = gettime ("Max ticket life", "unlimited");
} }
if(t){ if(t){
if(ent->max_life == NULL) if(ent->max_life == NULL)
@@ -113,12 +112,11 @@ doit2(HDB *db, hdb_entry *ent, int mod)
ent->max_life = NULL; ent->max_life = NULL;
} }
if(ent->max_renew){ if(ent->max_renew){
char *p; char buf[128];
asprintf(&p, "%d seconds", *ent->max_renew); unparse_time (*ent->max_renew, buf, sizeof(buf));
t = gettime ("Max renewable life", p, 1); t = gettime ("Max renewable life", buf);
free(p);
}else{ }else{
t = gettime ("Max renewable life", "unlimited", 1); t = gettime ("Max renewable life", "unlimited");
} }
if(t){ if(t){
if(ent->max_renew == NULL) if(ent->max_renew == NULL)
@@ -207,7 +205,7 @@ add_new_key(int argc, char **argv)
{ {
if(argc != 2){ if(argc != 2){
fprintf(stderr, "Usage: add_new_key principal\n"); fprintf(stderr, "Usage: add_new_key principal\n");
return; return 0;
} }
doit(argv[1], 0); doit(argv[1], 0);
@@ -219,7 +217,7 @@ mod_entry(int argc, char **argv)
{ {
if(argc != 2){ if(argc != 2){
fprintf(stderr, "Usage: mod_entry principal\n"); fprintf(stderr, "Usage: mod_entry principal\n");
return; return 0;
} }
doit(argv[1], 1); doit(argv[1], 1);

9
admin/init.c
View File

@@ -109,11 +109,10 @@ init(int argc, char **argv)
return 0; return 0;
} }
max_life = gettime("Realm max ticket life", "infinite", 1); max_life = gettime("Realm max ticket life", "infinite");
max_renew = gettime("Realm max renewable ticket life", "infinite", 1); max_renew = gettime("Realm max renewable ticket life", "infinite");
default_life = gettime("Default ticket life", "1 day", 1); default_life = gettime("Default ticket life", "1 day");
default_renew = gettime("Default renewable ticket life", "7 days", 1); default_renew = gettime("Default renewable ticket life", "7 days");
/* Create `krbtgt/REALM' */ /* Create `krbtgt/REALM' */
init_des_key(&ent); init_des_key(&ent);

9
kadmin/init.c
View File

@@ -109,11 +109,10 @@ init(int argc, char **argv)
return 0; return 0;
} }
max_life = gettime("Realm max ticket life", "infinite", 1); max_life = gettime("Realm max ticket life", "infinite");
max_renew = gettime("Realm max renewable ticket life", "infinite", 1); max_renew = gettime("Realm max renewable ticket life", "infinite");
default_life = gettime("Default ticket life", "1 day", 1); default_life = gettime("Default ticket life", "1 day");
default_renew = gettime("Default renewable ticket life", "7 days", 1); default_renew = gettime("Default renewable ticket life", "7 days");
/* Create `krbtgt/REALM' */ /* Create `krbtgt/REALM' */
init_des_key(&ent); init_des_key(&ent);