(ext_keytab): use the default modify keytab per default
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10041 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
14
kadmin/ext.c
14
kadmin/ext.c
@@ -87,6 +87,7 @@ ext_keytab(int argc, char **argv)
|
|||||||
int i;
|
int i;
|
||||||
int optind = 0;
|
int optind = 0;
|
||||||
char *keytab = NULL;
|
char *keytab = NULL;
|
||||||
|
char keytab_buf[256];
|
||||||
struct ext_keytab_data data;
|
struct ext_keytab_data data;
|
||||||
|
|
||||||
args[0].value = &keytab;
|
args[0].value = &keytab;
|
||||||
@@ -94,10 +95,17 @@ ext_keytab(int argc, char **argv)
|
|||||||
usage();
|
usage();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if(keytab)
|
if (keytab == NULL) {
|
||||||
|
ret = krb5_kt_default_modify_name (context, keytab_buf,
|
||||||
|
sizeof(keytab_buf));
|
||||||
|
if (ret) {
|
||||||
|
krb5_warn(context, ret, "krb5_kt_default_modify_name");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
keytab = keytab_buf;
|
||||||
|
}
|
||||||
|
|
||||||
ret = krb5_kt_resolve(context, keytab, &data.keytab);
|
ret = krb5_kt_resolve(context, keytab, &data.keytab);
|
||||||
else
|
|
||||||
ret = krb5_kt_default(context, &data.keytab);
|
|
||||||
if(ret){
|
if(ret){
|
||||||
krb5_warn(context, ret, "krb5_kt_resolve");
|
krb5_warn(context, ret, "krb5_kt_resolve");
|
||||||
return 0;
|
return 0;
|
||||||
|
Reference in New Issue
Block a user