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

print name when failing to open keytab

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8308 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-06-03 12:24:05 +00:00
parent 387a840eb1
commit 9961b240b7
6 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/change.c
View File

@@ -158,7 +158,7 @@ kt_change (int argc, char **argv)
ret = krb5_kt_start_seq_get(context, keytab, &cursor); ret = krb5_kt_start_seq_get(context, keytab, &cursor);
if(ret){ if(ret){
krb5_warn(context, ret, "krb5_kt_start_seq_get"); krb5_warn(context, ret, "krb5_kt_start_seq_get %s", keytab_string);
return 1; return 1;
} }

2
admin/copy.c
View File

@@ -89,7 +89,7 @@ kt_copy (int argc, char **argv)
ret = krb5_kt_start_seq_get (context, src_keytab, &cursor); ret = krb5_kt_start_seq_get (context, src_keytab, &cursor);
if (ret) { if (ret) {
krb5_warn (context, ret, "krb5_kt_start_seq_get"); krb5_warn (context, ret, "krb5_kt_start_seq_get %s", keytab_string);
goto fail; goto fail;
} }

6
admin/ktutil.c
View File

@@ -40,6 +40,8 @@ static int version_flag;
int verbose_flag; int verbose_flag;
char *keytab_string; char *keytab_string;
static char keytab_buf[256];
static int help(int argc, char **argv); static int help(int argc, char **argv);
static SL_cmd cmds[] = { static SL_cmd cmds[] = {
@@ -143,6 +145,10 @@ main(int argc, char **argv)
if(keytab_string) { if(keytab_string) {
ret = krb5_kt_resolve(context, keytab_string, &keytab); ret = krb5_kt_resolve(context, keytab_string, &keytab);
} else { } else {
if(krb5_kt_default_name (context, keytab_buf, sizeof(keytab_buf)))
strlcpy (keytab_buf, "unknown");
keytab_string = keytab_buf;
ret = krb5_kt_default(context, &keytab); ret = krb5_kt_default(context, &keytab);
} }
if(ret) if(ret)

2
admin/list.c
View File

@@ -44,7 +44,7 @@ kt_list(int argc, char **argv)
ret = krb5_kt_start_seq_get(context, keytab, &cursor); ret = krb5_kt_start_seq_get(context, keytab, &cursor);
if(ret){ if(ret){
krb5_warn(context, ret, "krb5_kt_start_seq_get"); krb5_warn(context, ret, "krb5_kt_start_seq_get %s", keytab_string);
return 1; return 1;
} }
printf("%s", "Version"); printf("%s", "Version");

4
admin/purge.c
View File

@@ -126,7 +126,7 @@ kt_purge(int argc, char **argv)
ret = krb5_kt_start_seq_get(context, keytab, &cursor); ret = krb5_kt_start_seq_get(context, keytab, &cursor);
if(ret){ if(ret){
krb5_warn(context, ret, "krb5_kt_start_seq_get"); krb5_warn(context, ret, "krb5_kt_start_seq_get %s", keytab_string);
return 1; return 1;
} }
@@ -140,7 +140,7 @@ kt_purge(int argc, char **argv)
ret = krb5_kt_start_seq_get(context, keytab, &cursor); ret = krb5_kt_start_seq_get(context, keytab, &cursor);
if(ret){ if(ret){
krb5_warn(context, ret, "krb5_kt_start_seq_get"); krb5_warn(context, ret, "krb5_kt_start_seq_get, %s", keytab_string);
return 1; return 1;
} }

4
admin/srvcreate.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 1998, 1999 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2000 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -83,7 +83,7 @@ srvcreate(int argc, char **argv)
ret = krb5_kt_start_seq_get(context, keytab, &cursor); ret = krb5_kt_start_seq_get(context, keytab, &cursor);
if(ret){ if(ret){
krb5_warn(context, ret, "krb5_kt_start_seq_get"); krb5_warn(context, ret, "krb5_kt_start_seq_get %s", keytab_string);
return 1; return 1;
} }