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/keytab.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/keytab.c')
| -rw-r--r-- | src/kadmin/cli/keytab.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/kadmin/cli/keytab.c b/src/kadmin/cli/keytab.c index 5a47bf159b..df4f6ce257 100644 --- a/src/kadmin/cli/keytab.c +++ b/src/kadmin/cli/keytab.c @@ -23,6 +23,7 @@ static int remove_principal(char *keytab_str, krb5_keytab keytab, char *princ_str, char *kvno_str); static char *etype_string(krb5_enctype enctype); +extern char *krb5_defkeyname; extern char *whoami; extern krb5_context context; extern void *handle; @@ -44,15 +45,10 @@ int process_keytab(krb5_context context, char **keytab_str, int code; if (*keytab_str == NULL) { - char *keytab_str = malloc(BUFSIZ); - - if (keytab_str == NULL) { - com_err(whoami, ENOMEM, "while creating default keytab name"); - return 1; - } - if ((code = krb5_kt_default_name(context, keytab_str, BUFSIZ))) { - com_err(whoami, code, "while copying default keytab name"); - free(*keytab_str); + /* XXX krb5_defkeyname is an internal library global and + should go away */ + if (! (*keytab_str = strdup(krb5_defkeyname))) { + com_err(whoami, ENOMEM, "while creating keytab name"); return 1; } code = krb5_kt_default(context, keytab); |