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/server | |
| 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/server')
| -rw-r--r-- | src/kadmin/server/ChangeLog | 7 | ||||
| -rw-r--r-- | src/kadmin/server/ovsec_kadmd.c | 24 |
2 files changed, 17 insertions, 14 deletions
diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog index 308b2f2df..6092176df 100644 --- a/src/kadmin/server/ChangeLog +++ b/src/kadmin/server/ChangeLog @@ -1,3 +1,10 @@ +Wed Nov 13 14:29:34 1996 Tom Yu <tlyu@mit.edu> + + * ovsec_kadmd.c (main): Note that krb5_defkeyname is an internal + interface. + + * ovsec_kadmd.c (main): Revert kt_default_name changes. + Tue Nov 12 22:07:05 1996 Tom Yu <tlyu@mit.edu> * ovsec_kadmd.c (main): Use krb5_kt_set_default_name() rather than diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c index 67aa77525..21514aca1 100644 --- a/src/kadmin/server/ovsec_kadmd.c +++ b/src/kadmin/server/ovsec_kadmd.c @@ -58,6 +58,13 @@ void *global_server_handle; #define OVSEC_KADM_ADMIN_SERVICE "ovsec_adm/admin" #define OVSEC_KADM_CHANGEPW_SERVICE "ovsec_adm/changepw" +/* + * This enables us to set the keytab that gss_acquire_cred uses, but + * it also restricts us to linking against the Kv5 GSS-API library. + * Since this is *k*admind, that shouldn't be a problem. + */ +extern char *krb5_defkeyname; + char *build_princ_name(char *name, char *realm); void log_badauth(OM_uint32 major, OM_uint32 minor, struct sockaddr_in *addr, char *data); @@ -309,20 +316,9 @@ int main(int argc, char *argv[]) exit(1); } - /* - * This enables us to set the keytab that gss_acquire_cred uses, but - * it also restricts us to linking against the Kv5 GSS-API library. - * Since this is *k*admind, that shouldn't be a problem. - */ - if ((ret = krb5_kt_set_default_name(context, params.admin_keytab))) { - krb5_klog_syslog(LOG_ERR, "Cannot change default keytab name: %s", - error_message(ret)); - fprintf(stderr, "%s: Cannot change default keytab name.\n", - whoami); - kadm5_destroy(global_server_handle); - krb5_klog_close(); - exit(1); - } + /* XXX krb5_defkeyname is an internal library global and should + go away */ + krb5_defkeyname = params.admin_keytab; /* * Try to acquire creds for the old OV services as well as the |