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@3193 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-08-27 23:19:09 +00:00
parent 2bc6b41743
commit 7e5b83322c
4 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
admin/delete.c
View File

@@ -44,28 +44,28 @@ int
del_entry(int argc, char **argv) del_entry(int argc, char **argv)
{ {
HDB *db; HDB *db;
int err; krb5_error_code ret;
hdb_entry ent; hdb_entry ent;
if(argc != 2){ if(argc != 2){
warnx("Usage: del_entry principal"); krb5_warnx(context, "Usage: del_entry principal");
return 0; 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((ret = hdb_open(context, &db, database, O_RDWR, 0600))){
warnx("hdb_open: %s", krb5_get_err_text(context, err)); krb5_warn(context, ret, "hdb_open");
return 0; return 0;
} }
err = db->delete(context, db, &ent); ret = db->delete(context, db, &ent);
switch(err){ switch(ret){
case 0: case 0:
break; break;
default: default:
warnx("delete: %s", krb5_get_err_text(context, err));; krb5_warn(context, ret, "delete");
break; break;
} }
krb5_free_principal (context, ent.principal); krb5_free_principal (context, ent.principal);

2
admin/dump.c
View File

@@ -78,7 +78,7 @@ hdb_entry2string(hdb_entry *ent, char **str)
{ {
char *p; char *p;
char buf[1024] = ""; char buf[1024] = "";
int i, j; int i;
krb5_unparse_name(context, ent->principal, &p); krb5_unparse_name(context, ent->principal, &p);
strcat(buf, p); strcat(buf, p);
strcat(buf, " "); strcat(buf, " ");

15
admin/extkeytab.c
View File

@@ -46,32 +46,29 @@ ext_keytab(int argc, char **argv)
HDB *db; HDB *db;
hdb_entry ent; hdb_entry ent;
int ret; int ret;
int i;
krb5_keytab kid; krb5_keytab kid;
krb5_keytab_entry key_entry; krb5_keytab_entry key_entry;
char *p;
if(argc < 2 || argc > 3){ if(argc < 2 || argc > 3){
warnx("Usage: ext_keytab principal [file]\n"); krb5_warnx(context, "Usage: ext_keytab principal [file]");
return 0; 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)); krb5_warn(context, ret, "hdb_open");
return 0; return 0;
} }
ret = krb5_parse_name (context, argv[1], &ent.principal); ret = krb5_parse_name (context, argv[1], &ent.principal);
if (ret) { if (ret) {
warnx("%s", krb5_get_err_text(context, ret)); krb5_warn(context, ret, "krb5_parse_name");
goto cleanup1; goto cleanup1;
} }
ret = db->fetch(context, db, &ent); ret = db->fetch(context, db, &ent);
if (ret) { if (ret) {
warnx ("%s", krb5_get_err_text(context, ret)); krb5_warn (context, ret, "db->fetch");
krb5_free_principal (context, ent.principal); krb5_free_principal (context, ent.principal);
goto cleanup1; goto cleanup1;
} }
@@ -95,7 +92,7 @@ ext_keytab(int argc, char **argv)
} }
if (ret) { if (ret) {
warnx("%s", krb5_get_err_text(context, ret)); krb5_warn(context, ret, "krb5_kt_resolve");
goto cleanup2; goto cleanup2;
} }
@@ -105,7 +102,7 @@ ext_keytab(int argc, char **argv)
/* XXX - krb5_kt_free_entry? */ /* XXX - krb5_kt_free_entry? */
if (ret) { if (ret) {
warnx("%s", krb5_get_err_text(context, ret)); krb5_warn(context, ret, "krb5_kt_add_entry");
} }
krb5_kt_close (context, kid); krb5_kt_close (context, kid);
cleanup2: cleanup2:

2
kadmin/dump.c
View File

@@ -78,7 +78,7 @@ hdb_entry2string(hdb_entry *ent, char **str)
{ {
char *p; char *p;
char buf[1024] = ""; char buf[1024] = "";
int i, j; int i;
krb5_unparse_name(context, ent->principal, &p); krb5_unparse_name(context, ent->principal, &p);
strcat(buf, p); strcat(buf, p);
strcat(buf, " "); strcat(buf, " ");