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

updated to new sl

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2429 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-07-18 01:06:08 +00:00
parent 4381cacb0e
commit 14c550fe26
12 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/admin_locl.h
View File

@@ -75,7 +75,7 @@
extern krb5_context context; extern krb5_context context;
extern char *database; extern char *database;
#define DECL(X) void X(int, char **) #define DECL(X) int X(int, char **)
DECL(get_entry); DECL(get_entry);
DECL(load); DECL(load);

6
admin/ank.c
View File

@@ -150,7 +150,7 @@ out:
} }
void int
add_new_key(int argc, char **argv) add_new_key(int argc, char **argv)
{ {
if(argc != 2){ if(argc != 2){
@@ -159,9 +159,10 @@ add_new_key(int argc, char **argv)
} }
doit(argv[1], 0); doit(argv[1], 0);
return 0;
} }
void int
mod_entry(int argc, char **argv) mod_entry(int argc, char **argv)
{ {
if(argc != 2){ if(argc != 2){
@@ -170,4 +171,5 @@ mod_entry(int argc, char **argv)
} }
doit(argv[1], 1); doit(argv[1], 1);
return 0;
} }

7
admin/delete.c
View File

@@ -40,7 +40,7 @@
RCSID("$Id$"); RCSID("$Id$");
void int
del_entry(int argc, char **argv) del_entry(int argc, char **argv)
{ {
HDB *db; HDB *db;
@@ -49,14 +49,14 @@ del_entry(int argc, char **argv)
if(argc != 2){ if(argc != 2){
warnx("Usage: del_entry principal"); warnx("Usage: del_entry principal");
return; return 0;
} }
krb5_parse_name(context, argv[1], &ent.principal); krb5_parse_name(context, argv[1], &ent.principal);
if((err = hdb_open(context, &db, database, O_RDWR, 0600))){ if((err = hdb_open(context, &db, database, O_RDWR, 0600))){
warnx("hdb_open: %s", krb5_get_err_text(context, err)); warnx("hdb_open: %s", krb5_get_err_text(context, err));
return; return 0;
} }
err = db->delete(context, db, &ent); err = db->delete(context, db, &ent);
@@ -71,4 +71,5 @@ del_entry(int argc, char **argv)
krb5_free_principal (context, ent.principal); krb5_free_principal (context, ent.principal);
memset(&ent, 0, sizeof(ent)); memset(&ent, 0, sizeof(ent));
db->close(context, db); db->close(context, db);
return 0;
} }

5
admin/dump.c
View File

@@ -66,7 +66,7 @@ key2str(krb5_keyblock *key)
return s; return s;
} }
void int
dump(int argc, char **argv) dump(int argc, char **argv)
{ {
HDB *db; HDB *db;
@@ -86,7 +86,7 @@ dump(int argc, char **argv)
warnx("hdb_open: %s", krb5_get_err_text(context, err)); warnx("hdb_open: %s", krb5_get_err_text(context, err));
if(f != stdout) if(f != stdout)
fclose(f); fclose(f);
return; return 0;
} }
err = db->firstkey(context, db, &ent); err = db->firstkey(context, db, &ent);
while(err == 0){ while(err == 0){
@@ -111,4 +111,5 @@ dump(int argc, char **argv)
if(f != stdout) if(f != stdout)
fclose(f); fclose(f);
db->close(context, db); db->close(context, db);
return 0;
} }

7
admin/extkeytab.c
View File

@@ -40,7 +40,7 @@
RCSID("$Id$"); RCSID("$Id$");
void int
ext_keytab(int argc, char **argv) ext_keytab(int argc, char **argv)
{ {
HDB *db; HDB *db;
@@ -53,14 +53,14 @@ ext_keytab(int argc, char **argv)
if(argc != 2){ if(argc != 2){
warnx("Usage: ext_keytab principal\n"); warnx("Usage: ext_keytab principal\n");
return; return 0;
} }
ret = hdb_open(context, &db, database, O_RDONLY, 0600); ret = hdb_open(context, &db, database, O_RDONLY, 0600);
if(ret){ if(ret){
warnx("%s", krb5_get_err_text(context, ret)); warnx("%s", krb5_get_err_text(context, ret));
return; return 0;
} }
ret = krb5_parse_name (context, argv[1], &ent.principal); ret = krb5_parse_name (context, argv[1], &ent.principal);
@@ -105,4 +105,5 @@ cleanup2:
hdb_free_entry (context, &ent); hdb_free_entry (context, &ent);
cleanup1: cleanup1:
db->close (context, db); db->close (context, db);
return 0;
} }

7
admin/get.c
View File

@@ -40,7 +40,7 @@
RCSID("$Id$"); RCSID("$Id$");
void int
get_entry(int argc, char **argv) get_entry(int argc, char **argv)
{ {
HDB *db; HDB *db;
@@ -49,14 +49,14 @@ get_entry(int argc, char **argv)
if(argc != 2){ if(argc != 2){
fprintf(stderr, "Usage: get_entry principal\n"); fprintf(stderr, "Usage: get_entry principal\n");
return; return 0;
} }
krb5_parse_name(context, argv[1], &ent.principal); krb5_parse_name(context, argv[1], &ent.principal);
if((err = hdb_open(context, &db, database, O_RDONLY, 0600))){ if((err = hdb_open(context, &db, database, O_RDONLY, 0600))){
fprintf(stderr, "hdb_open: %s\n", krb5_get_err_text(context, err)); fprintf(stderr, "hdb_open: %s\n", krb5_get_err_text(context, err));
return; return 0;
} }
err = db->fetch(context, db, &ent); err = db->fetch(context, db, &ent);
@@ -86,4 +86,5 @@ get_entry(int argc, char **argv)
} }
memset(&ent, 0, sizeof(ent)); memset(&ent, 0, sizeof(ent));
db->close(context, db); db->close(context, db);
return 0;
} }

7
admin/init.c
View File

@@ -65,7 +65,7 @@ get_time(const char *prompt, time_t def)
} }
void int
init(int argc, char **argv) init(int argc, char **argv)
{ {
HDB *db; HDB *db;
@@ -86,7 +86,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)); warnx("hdb_open: %s", krb5_get_err_text(context, err));
return; return 0;
} }
memset(&ent, 0, sizeof(ent)); memset(&ent, 0, sizeof(ent));
for(i = 1; i < argc; i++){ for(i = 1; i < argc; i++){
@@ -106,7 +106,7 @@ init(int argc, char **argv)
default: default:
warnx("hdb_fetch: %s", krb5_get_err_text(context, err)); warnx("hdb_fetch: %s", krb5_get_err_text(context, err));
db->close(context, db); db->close(context, db);
return; return 0;
} }
max_life = get_time("Realm max ticket life", max_life); max_life = get_time("Realm max ticket life", max_life);
@@ -159,4 +159,5 @@ init(int argc, char **argv)
hdb_free_entry(context, &ent); hdb_free_entry(context, &ent);
} }
db->close(context, db); db->close(context, db);
return 0;
} }

7
admin/kdb_edit.c
View File

@@ -59,16 +59,17 @@ static SL_cmd commands[] = {
krb5_context context; krb5_context context;
char *database = HDB_DEFAULT_DB; char *database = HDB_DEFAULT_DB;
void int
help(int argc, char **argv) help(int argc, char **argv)
{ {
sl_help(commands, argc, argv); sl_help(commands, argc, argv);
return 0;
} }
void int
exit_kdb_edit (int argc, char **argv) exit_kdb_edit (int argc, char **argv)
{ {
exit (0); return 1;
} }
int int

6
admin/load.c
View File

@@ -144,7 +144,7 @@ doit(char *filename, int merge)
fclose(f); fclose(f);
} }
void int
load(int argc, char **argv) load(int argc, char **argv)
{ {
if(argc < 2){ if(argc < 2){
@@ -152,9 +152,10 @@ load(int argc, char **argv)
return; return;
} }
doit(argv[1], 0); doit(argv[1], 0);
return 0;
} }
void int
merge(int argc, char **argv) merge(int argc, char **argv)
{ {
if(argc < 2){ if(argc < 2){
@@ -162,4 +163,5 @@ merge(int argc, char **argv)
return; return;
} }
doit(argv[1], 1); doit(argv[1], 1);
return 0;
} }

5
kadmin/dump.c
View File

@@ -66,7 +66,7 @@ key2str(krb5_keyblock *key)
return s; return s;
} }
void int
dump(int argc, char **argv) dump(int argc, char **argv)
{ {
HDB *db; HDB *db;
@@ -86,7 +86,7 @@ dump(int argc, char **argv)
warnx("hdb_open: %s", krb5_get_err_text(context, err)); warnx("hdb_open: %s", krb5_get_err_text(context, err));
if(f != stdout) if(f != stdout)
fclose(f); fclose(f);
return; return 0;
} }
err = db->firstkey(context, db, &ent); err = db->firstkey(context, db, &ent);
while(err == 0){ while(err == 0){
@@ -111,4 +111,5 @@ dump(int argc, char **argv)
if(f != stdout) if(f != stdout)
fclose(f); fclose(f);
db->close(context, db); db->close(context, db);
return 0;
} }

7
kadmin/init.c
View File

@@ -65,7 +65,7 @@ get_time(const char *prompt, time_t def)
} }
void int
init(int argc, char **argv) init(int argc, char **argv)
{ {
HDB *db; HDB *db;
@@ -86,7 +86,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)); warnx("hdb_open: %s", krb5_get_err_text(context, err));
return; return 0;
} }
memset(&ent, 0, sizeof(ent)); memset(&ent, 0, sizeof(ent));
for(i = 1; i < argc; i++){ for(i = 1; i < argc; i++){
@@ -106,7 +106,7 @@ init(int argc, char **argv)
default: default:
warnx("hdb_fetch: %s", krb5_get_err_text(context, err)); warnx("hdb_fetch: %s", krb5_get_err_text(context, err));
db->close(context, db); db->close(context, db);
return; return 0;
} }
max_life = get_time("Realm max ticket life", max_life); max_life = get_time("Realm max ticket life", max_life);
@@ -159,4 +159,5 @@ init(int argc, char **argv)
hdb_free_entry(context, &ent); hdb_free_entry(context, &ent);
} }
db->close(context, db); db->close(context, db);
return 0;
} }

6
kadmin/load.c
View File

@@ -144,7 +144,7 @@ doit(char *filename, int merge)
fclose(f); fclose(f);
} }
void int
load(int argc, char **argv) load(int argc, char **argv)
{ {
if(argc < 2){ if(argc < 2){
@@ -152,9 +152,10 @@ load(int argc, char **argv)
return; return;
} }
doit(argv[1], 0); doit(argv[1], 0);
return 0;
} }
void int
merge(int argc, char **argv) merge(int argc, char **argv)
{ {
if(argc < 2){ if(argc < 2){
@@ -162,4 +163,5 @@ merge(int argc, char **argv)
return; return;
} }
doit(argv[1], 1); doit(argv[1], 1);
return 0;
} }