|
 |
54faf41 |
--- krb5-1.5/src/kadmin/cli/kadmin.c.kt_default_name 2006-10-18 14:13:18.000000000 -0400
|
|
|
54faf41 |
+++ krb5-1.5/src/kadmin/cli/kadmin.c 2006-10-18 14:13:35.000000000 -0400
|
|
|
54faf41 |
@@ -533,15 +533,6 @@
|
|
|
54faf41 |
exit(1);
|
|
|
54faf41 |
}
|
|
|
54faf41 |
|
|
|
54faf41 |
- /* register the WRFILE keytab type and set it as the default */
|
|
|
54faf41 |
- {
|
|
|
54faf41 |
-#define DEFAULT_KEYTAB "WRFILE:/etc/krb5.keytab"
|
|
|
54faf41 |
- /* XXX krb5_defkeyname is an internal library global and
|
|
|
54faf41 |
- should go away */
|
|
|
54faf41 |
- extern char *krb5_defkeyname;
|
|
|
54faf41 |
- krb5_defkeyname = DEFAULT_KEYTAB;
|
|
|
54faf41 |
- }
|
|
|
54faf41 |
-
|
|
|
54faf41 |
return query;
|
|
|
54faf41 |
}
|
|
|
54faf41 |
|
|
|
54faf41 |
--- krb5-1.5/src/kadmin/cli/keytab.c.kt_default_name 2006-10-18 14:07:36.000000000 -0400
|
|
|
54faf41 |
+++ krb5-1.5/src/kadmin/cli/keytab.c 2006-10-18 14:51:21.000000000 -0400
|
|
|
54faf41 |
@@ -69,15 +69,20 @@
|
|
|
54faf41 |
krb5_keytab *keytab)
|
|
|
54faf41 |
{
|
|
|
54faf41 |
int code;
|
|
|
54faf41 |
+ char filename[FILENAME_MAX];
|
|
|
54faf41 |
|
|
|
54faf41 |
if (*keytab_str == NULL) {
|
|
|
54faf41 |
- /* XXX krb5_defkeyname is an internal library global and
|
|
|
54faf41 |
- should go away */
|
|
|
54faf41 |
- if (! (*keytab_str = strdup(krb5_defkeyname))) {
|
|
|
54faf41 |
- com_err(whoami, ENOMEM, "while creating keytab name");
|
|
|
54faf41 |
+ code = krb5_kt_default_name(my_context, filename, sizeof(filename));
|
|
|
54faf41 |
+ if (code != 0) {
|
|
|
54faf41 |
+ com_err(whoami, code, "while determining default keytab name");
|
|
|
54faf41 |
+ return 1;
|
|
|
54faf41 |
+ }
|
|
|
54faf41 |
+ *keytab_str = strdup(filename);
|
|
|
54faf41 |
+ if (*keytab_str == NULL) {
|
|
|
54faf41 |
+ com_err(whoami, ENOMEM, "while creating default keytab name");
|
|
|
54faf41 |
return 1;
|
|
|
54faf41 |
}
|
|
|
54faf41 |
- code = krb5_kt_default(my_context, keytab);
|
|
|
54faf41 |
+ code = krb5_kt_resolve(my_context, *keytab_str, keytab);
|
|
|
54faf41 |
if (code != 0) {
|
|
|
54faf41 |
com_err(whoami, code, "while opening default keytab");
|
|
|
54faf41 |
free(*keytab_str);
|