print name when failing to open keytab
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8308 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -158,7 +158,7 @@ kt_change (int argc, char **argv)
|
||||
|
||||
ret = krb5_kt_start_seq_get(context, keytab, &cursor);
|
||||
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;
|
||||
}
|
||||
|
||||
|
@@ -89,7 +89,7 @@ kt_copy (int argc, char **argv)
|
||||
|
||||
ret = krb5_kt_start_seq_get (context, src_keytab, &cursor);
|
||||
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;
|
||||
}
|
||||
|
||||
|
@@ -40,6 +40,8 @@ static int version_flag;
|
||||
int verbose_flag;
|
||||
char *keytab_string;
|
||||
|
||||
static char keytab_buf[256];
|
||||
|
||||
static int help(int argc, char **argv);
|
||||
|
||||
static SL_cmd cmds[] = {
|
||||
@@ -143,6 +145,10 @@ main(int argc, char **argv)
|
||||
if(keytab_string) {
|
||||
ret = krb5_kt_resolve(context, keytab_string, &keytab);
|
||||
} 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);
|
||||
}
|
||||
if(ret)
|
||||
|
@@ -44,7 +44,7 @@ kt_list(int argc, char **argv)
|
||||
|
||||
ret = krb5_kt_start_seq_get(context, keytab, &cursor);
|
||||
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;
|
||||
}
|
||||
printf("%s", "Version");
|
||||
|
@@ -126,7 +126,7 @@ kt_purge(int argc, char **argv)
|
||||
|
||||
ret = krb5_kt_start_seq_get(context, keytab, &cursor);
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -140,7 +140,7 @@ kt_purge(int argc, char **argv)
|
||||
|
||||
ret = krb5_kt_start_seq_get(context, keytab, &cursor);
|
||||
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;
|
||||
}
|
||||
|
||||
|
@@ -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).
|
||||
* All rights reserved.
|
||||
*
|
||||
@@ -83,7 +83,7 @@ srvcreate(int argc, char **argv)
|
||||
|
||||
ret = krb5_kt_start_seq_get(context, keytab, &cursor);
|
||||
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;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user