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

removed unused stuff.

Browse Source 
use krb5_{warn,err}*


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3197 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-08-27 23:37:06 +00:00
parent b1978dc705
commit 30d8b82a41
4 changed files with 22 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
admin/init.c
View File

@@ -40,42 +40,13 @@
RCSID("$Id$"); RCSID("$Id$");
time_t
get_time(const char *prompt, time_t def)
{
char buf[1024];
int tmp;
while(1){
if(def == 0)
printf("%s: [infinite] ", prompt);
else
printf("%s: [%d] ", prompt, def);
fgets(buf, sizeof(buf), stdin);
if(buf[strlen(buf) - 1] == '\n')
buf[strlen(buf) - 1] = 0;
if(buf[0] == 0)
return def;
if(strncmp(buf, "infinite", strlen(buf)) == 0)
return 0;
if(sscanf(buf, "%d", &tmp) == 1)
return tmp;
printf("Please specify a number\n");
}
}
int int
init(int argc, char **argv) init(int argc, char **argv)
{ {
HDB *db; HDB *db;
char s[1024];
char *p;
int line;
int err; int err;
int i; int i;
int tmp;
int default_life = 86400; int default_life = 86400;
int default_renew = 5 * 86400; int default_renew = 5 * 86400;
int max_life = 0; int max_life = 0;
@@ -85,7 +56,7 @@ init(int argc, char **argv)
err = hdb_open(context, &db, database, O_RDWR | O_CREAT, 0600); err = hdb_open(context, &db, database, O_RDWR | O_CREAT, 0600);
if(err){ if(err){
warnx("hdb_open: %s", krb5_get_err_text(context, err)); krb5_warn(context, err, "hdb_open");
return 0; return 0;
} }
memset(&ent, 0, sizeof(ent)); memset(&ent, 0, sizeof(ent));
@@ -98,21 +69,21 @@ init(int argc, char **argv)
err = db->fetch(context, db, &ent); err = db->fetch(context, db, &ent);
switch(err){ switch(err){
case 0: case 0:
fprintf(stderr, "Entry already exists\n"); krb5_warnx(context, "Entry already exists");
krb5_free_principal(context, ent.principal); krb5_free_principal(context, ent.principal);
continue; continue;
case HDB_ERR_NOENTRY: case HDB_ERR_NOENTRY:
break; break;
default: default:
warnx("hdb_fetch: %s", krb5_get_err_text(context, err)); krb5_warn(context, err, "hdb_fetch");
db->close(context, db); db->close(context, db);
return 0; return 0;
} }
max_life = gettime("Realm max ticket life", "infinite"); max_life = getlife("Realm max ticket life", "infinite");
max_renew = gettime("Realm max renewable ticket life", "infinite"); max_renew = getlife("Realm max renewable ticket life", "infinite");
default_life = gettime("Default ticket life", "1 day"); default_life = getlife("Default ticket life", "1 day");
default_renew = gettime("Default renewable ticket life", "7 days"); default_renew = getlife("Default renewable ticket life", "7 days");
/* Create `krbtgt/REALM' */ /* Create `krbtgt/REALM' */
init_des_key(&ent); init_des_key(&ent);

10
admin/load.c
View File

@@ -99,7 +99,6 @@ parse_integer(unsigned *u, char *s)
static void static void
parse_keys(hdb_entry *ent, char *str) parse_keys(hdb_entry *ent, char *str)
{ {
Key *key;
int tmp; int tmp;
char *p; char *p;
int i; int i;
@@ -205,7 +204,6 @@ doit(char *filename, int merge)
char *p; char *p;
int line; int line;
int err; int err;
int i;
int flags = O_RDWR; int flags = O_RDWR;
struct entry e; struct entry e;
@@ -213,14 +211,14 @@ doit(char *filename, int merge)
f = fopen(filename, "r"); f = fopen(filename, "r");
if(f == NULL){ if(f == NULL){
fprintf(stderr, "%s: %s\n", filename, strerror(errno)); krb5_warn(context, errno, "%s: %s", filename);
return; return;
} }
if(!merge) if(!merge)
flags |= O_CREAT | O_TRUNC; flags |= O_CREAT | O_TRUNC;
err = hdb_open(context, &db, database, flags, 0600); err = hdb_open(context, &db, database, flags, 0600);
if(err){ if(err){
fprintf(stderr, "hdb_open: %s\n", krb5_get_err_text(context, err)); krb5_warn(context, err, "hdb_open");
fclose(f); fclose(f);
return; return;
} }
@@ -298,7 +296,7 @@ int
load(int argc, char **argv) load(int argc, char **argv)
{ {
if(argc < 2){ if(argc < 2){
fprintf(stderr, "Usage: load filename\n"); krb5_warnx(context, "Usage: load filename");
return 0; return 0;
} }
doit(argv[1], 0); doit(argv[1], 0);
@@ -309,7 +307,7 @@ int
merge(int argc, char **argv) merge(int argc, char **argv)
{ {
if(argc < 2){ if(argc < 2){
fprintf(stderr, "Usage: merge filename\n"); krb5_warnx(context, "Usage: merge filename");
return 0; return 0;
} }
doit(argv[1], 1); doit(argv[1], 1);

43
kadmin/init.c
View File

@@ -40,42 +40,13 @@
RCSID("$Id$"); RCSID("$Id$");
time_t
get_time(const char *prompt, time_t def)
{
char buf[1024];
int tmp;
while(1){
if(def == 0)
printf("%s: [infinite] ", prompt);
else
printf("%s: [%d] ", prompt, def);
fgets(buf, sizeof(buf), stdin);
if(buf[strlen(buf) - 1] == '\n')
buf[strlen(buf) - 1] = 0;
if(buf[0] == 0)
return def;
if(strncmp(buf, "infinite", strlen(buf)) == 0)
return 0;
if(sscanf(buf, "%d", &tmp) == 1)
return tmp;
printf("Please specify a number\n");
}
}
int int
init(int argc, char **argv) init(int argc, char **argv)
{ {
HDB *db; HDB *db;
char s[1024];
char *p;
int line;
int err; int err;
int i; int i;
int tmp;
int default_life = 86400; int default_life = 86400;
int default_renew = 5 * 86400; int default_renew = 5 * 86400;
int max_life = 0; int max_life = 0;
@@ -85,7 +56,7 @@ init(int argc, char **argv)
err = hdb_open(context, &db, database, O_RDWR | O_CREAT, 0600); err = hdb_open(context, &db, database, O_RDWR | O_CREAT, 0600);
if(err){ if(err){
warnx("hdb_open: %s", krb5_get_err_text(context, err)); krb5_warn(context, err, "hdb_open");
return 0; return 0;
} }
memset(&ent, 0, sizeof(ent)); memset(&ent, 0, sizeof(ent));
@@ -98,21 +69,21 @@ init(int argc, char **argv)
err = db->fetch(context, db, &ent); err = db->fetch(context, db, &ent);
switch(err){ switch(err){
case 0: case 0:
fprintf(stderr, "Entry already exists\n"); krb5_warnx(context, "Entry already exists");
krb5_free_principal(context, ent.principal); krb5_free_principal(context, ent.principal);
continue; continue;
case HDB_ERR_NOENTRY: case HDB_ERR_NOENTRY:
break; break;
default: default:
warnx("hdb_fetch: %s", krb5_get_err_text(context, err)); krb5_warn(context, err, "hdb_fetch");
db->close(context, db); db->close(context, db);
return 0; return 0;
} }
max_life = gettime("Realm max ticket life", "infinite"); max_life = getlife("Realm max ticket life", "infinite");
max_renew = gettime("Realm max renewable ticket life", "infinite"); max_renew = getlife("Realm max renewable ticket life", "infinite");
default_life = gettime("Default ticket life", "1 day"); default_life = getlife("Default ticket life", "1 day");
default_renew = gettime("Default renewable ticket life", "7 days"); default_renew = getlife("Default renewable ticket life", "7 days");
/* Create `krbtgt/REALM' */ /* Create `krbtgt/REALM' */
init_des_key(&ent); init_des_key(&ent);

10
kadmin/load.c
View File

@@ -99,7 +99,6 @@ parse_integer(unsigned *u, char *s)
static void static void
parse_keys(hdb_entry *ent, char *str) parse_keys(hdb_entry *ent, char *str)
{ {
Key *key;
int tmp; int tmp;
char *p; char *p;
int i; int i;
@@ -205,7 +204,6 @@ doit(char *filename, int merge)
char *p; char *p;
int line; int line;
int err; int err;
int i;
int flags = O_RDWR; int flags = O_RDWR;
struct entry e; struct entry e;
@@ -213,14 +211,14 @@ doit(char *filename, int merge)
f = fopen(filename, "r"); f = fopen(filename, "r");
if(f == NULL){ if(f == NULL){
fprintf(stderr, "%s: %s\n", filename, strerror(errno)); krb5_warn(context, errno, "%s: %s", filename);
return; return;
} }
if(!merge) if(!merge)
flags |= O_CREAT | O_TRUNC; flags |= O_CREAT | O_TRUNC;
err = hdb_open(context, &db, database, flags, 0600); err = hdb_open(context, &db, database, flags, 0600);
if(err){ if(err){
fprintf(stderr, "hdb_open: %s\n", krb5_get_err_text(context, err)); krb5_warn(context, err, "hdb_open");
fclose(f); fclose(f);
return; return;
} }
@@ -298,7 +296,7 @@ int
load(int argc, char **argv) load(int argc, char **argv)
{ {
if(argc < 2){ if(argc < 2){
fprintf(stderr, "Usage: load filename\n"); krb5_warnx(context, "Usage: load filename");
return 0; return 0;
} }
doit(argv[1], 0); doit(argv[1], 0);
@@ -309,7 +307,7 @@ int
merge(int argc, char **argv) merge(int argc, char **argv)
{ {
if(argc < 2){ if(argc < 2){
fprintf(stderr, "Usage: merge filename\n"); krb5_warnx(context, "Usage: merge filename");
return 0; return 0;
} }
doit(argv[1], 1); doit(argv[1], 1);