Add keytab argument.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2820 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -51,8 +51,8 @@ ext_keytab(int argc, char **argv)
|
|||||||
krb5_keytab_entry key_entry;
|
krb5_keytab_entry key_entry;
|
||||||
char *p;
|
char *p;
|
||||||
|
|
||||||
if(argc != 2){
|
if(argc < 2 || argc > 3){
|
||||||
warnx("Usage: ext_keytab principal\n");
|
warnx("Usage: ext_keytab principal [file]\n");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -85,7 +85,15 @@ ext_keytab(int argc, char **argv)
|
|||||||
ent.keys.val[0].key.keyvalue.data,
|
ent.keys.val[0].key.keyvalue.data,
|
||||||
ent.keys.val[0].key.keyvalue.length);
|
ent.keys.val[0].key.keyvalue.length);
|
||||||
|
|
||||||
ret = krb5_kt_default (context, &kid);
|
{
|
||||||
|
char ktname[128] = "FILE:";
|
||||||
|
if(argc == 3)
|
||||||
|
strcat(ktname, argv[2]);
|
||||||
|
else
|
||||||
|
ret = krb5_kt_default_name(context, ktname, sizeof(ktname));
|
||||||
|
ret = krb5_kt_resolve(context, ktname, &kid);
|
||||||
|
}
|
||||||
|
|
||||||
if (ret) {
|
if (ret) {
|
||||||
warnx("%s", krb5_get_err_text(context, ret));
|
warnx("%s", krb5_get_err_text(context, ret));
|
||||||
goto cleanup2;
|
goto cleanup2;
|
||||||
|
Reference in New Issue
Block a user