diff options
| author | Tom Yu <tlyu@mit.edu> | 1996-11-13 21:05:00 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1996-11-13 21:05:00 +0000 |
| commit | 81daff23ac65fdc3ce54f88151b934ce8e063fb3 (patch) | |
| tree | f8f38b061d634d97d0bdc80d41d28d6de46436fb /src/kadmin/cli/kadmin.c | |
| parent | 7d984070f857f571b2040ed9a5b7b1c20e0531e9 (diff) | |
| download | krb5-81daff23ac65fdc3ce54f88151b934ce8e063fb3.tar.gz krb5-81daff23ac65fdc3ce54f88151b934ce8e063fb3.tar.xz krb5-81daff23ac65fdc3ce54f88151b934ce8e063fb3.zip | |
revert kt_default_name changes; see ChangeLogs for details
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9407 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/cli/kadmin.c')
| -rw-r--r-- | src/kadmin/cli/kadmin.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c index 1881c872a..d8011f86e 100644 --- a/src/kadmin/cli/kadmin.c +++ b/src/kadmin/cli/kadmin.c @@ -421,24 +421,11 @@ char *kadmin_startup(argc, argv) exit(1); } { - /* hack up the default keytab name to begin with "WRFILE:" */ - char *cp, ktdef[BUFSIZ]; - if ((retval = krb5_kt_default_name(context, ktdef, BUFSIZ))) { - com_err(whoami, retval, "while looking up default keytab name"); - exit(1); - } - if ((cp = malloc(strlen(ktdef) + 1 + 2)) == NULL) { - com_err(whoami, ENOMEM, "while editting default keytab name"); - exit(1); - } - strcpy(cp, "WR"); - strcat(cp, ktdef); - if ((retval = krb5_kt_set_default_name(context, cp))) { - com_err(whoami, retval, - "while changing default keytab name"); - exit(1); - } - free(cp); +#define DEFAULT_KEYTAB "WRFILE:/etc/v5srvtab" + /* XXX krb5_defkeyname is an internal library global and + should go away */ + extern char *krb5_defkeyname; + krb5_defkeyname = DEFAULT_KEYTAB; } return query; |