diff options
| author | Chris Provenzano <proven@mit.edu> | 1995-02-08 01:34:11 +0000 |
|---|---|---|
| committer | Chris Provenzano <proven@mit.edu> | 1995-02-08 01:34:11 +0000 |
| commit | 70830349548e398a521e0cedc33e2147ef4b1c1e (patch) | |
| tree | e06385ac4aa69668aac169537d800891bd9d528e /src | |
| parent | b8e0e13fac14038727fd80d7b2daf7374f574594 (diff) | |
| download | krb5-70830349548e398a521e0cedc33e2147ef4b1c1e.tar.gz krb5-70830349548e398a521e0cedc33e2147ef4b1c1e.tar.xz krb5-70830349548e398a521e0cedc33e2147ef4b1c1e.zip | |
* kadmin.c Removed krb5_keytype, changed krb5_enctype to
krb5_enctype *, changed krb5_preauthtype to krb5_preauthtype *
for krb5_get_in_tkt_with_password() rotuine.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4920 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/kadmin/client/ChangeLog | 6 | ||||
| -rw-r--r-- | src/kadmin/client/kadmin.c | 28 |
2 files changed, 10 insertions, 24 deletions
diff --git a/src/kadmin/client/ChangeLog b/src/kadmin/client/ChangeLog index c17ec8f6f..1a7327791 100644 --- a/src/kadmin/client/ChangeLog +++ b/src/kadmin/client/ChangeLog @@ -1,3 +1,9 @@ +Mon Feb 06 17:19:04 1995 Chris Provenzano (proven@mit.edu) + + * kadmin.c Removed krb5_keytype, changed krb5_enctype to + krb5_enctype *, changed krb5_preauthtype to krb5_preauthtype * + for krb5_get_in_tkt_with_password() rotuine. + Fri Feb 3 03:03:27 1995 John Gilmore <gnu@cygnus.com> * kadmin.c (main): Real live non-kludged argument parsing. diff --git a/src/kadmin/client/kadmin.c b/src/kadmin/client/kadmin.c index 814f50946..f44bc7b28 100644 --- a/src/kadmin/client/kadmin.c +++ b/src/kadmin/client/kadmin.c @@ -43,15 +43,6 @@ #include <krb5/kdb.h> #include <krb5/kdb_dbm.h> -/* - * Try no preauthentication first; then try the encrypted timestamp - */ -int preauth_search_list[] = { - 0, - KRB5_PADATA_ENC_TIMESTAMP, - -1 - }; - static krb5_error_code get_first_ticket PROTOTYPE((krb5_context, krb5_ccache, @@ -589,22 +580,11 @@ get_first_ticket(context, cache, client) } /* Build Request for Initial Credentials */ - for (i=0; preauth_search_list[i] >= 0; i++) { - retval = krb5_get_in_tkt_with_password(context, - 0, /* options */ + retval = krb5_get_in_tkt_with_password(context, 0, /* options */ my_addresses, - /* do random preauth */ - preauth_search_list[i], - ETYPE_DES_CBC_CRC, /* etype */ - KEYTYPE_DES, - password, - cache, - &my_creds, - 0); - if (retval != KRB5KDC_ERR_PREAUTH_FAILED && - retval != KRB5KRB_ERR_GENERIC) - break; - } + NULL, /* Default encryption list */ + NULL, /* Default preauth list */ + password, cache, &my_creds, 0); /* Do NOT Forget to zap password */ memset((char *) password, 0, pwsize); |