diff options
| author | Theodore Tso <tytso@mit.edu> | 1998-02-20 21:49:36 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1998-02-20 21:49:36 +0000 |
| commit | 27352d7e321ef9940f6a0c30e2fbb37e85567f22 (patch) | |
| tree | 8b3b740dc53f6f322083b97f5a083f3f91ba5247 | |
| parent | 096f00e1426533d92fd75865baf7b3cd34ed6458 (diff) | |
| download | krb5-27352d7e321ef9940f6a0c30e2fbb37e85567f22.tar.gz krb5-27352d7e321ef9940f6a0c30e2fbb37e85567f22.tar.xz krb5-27352d7e321ef9940f6a0c30e2fbb37e85567f22.zip | |
kdc_preauth.c (get_preauth_hint_list): Don't add the pseudo preauth
type KRB5_PADATA_PW_SALT to the hint list of supported
preauthentication systems, since it doesn't help to send it. (And it
may screw up Cygnus KerbNet clients.)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10466 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/kdc/ChangeLog | 7 | ||||
| -rw-r--r-- | src/kdc/kdc_preauth.c | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index af6c433ae..eaab61b0e 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,3 +1,10 @@ +Fri Feb 20 15:58:21 1998 Theodore Y. Ts'o <tytso@mit.edu> + + * kdc_preauth.c (get_preauth_hint_list): Don't add the pseudo + preauth type KRB5_PADATA_PW_SALT to the hint list of + supported preauthentication systems, since it doesn't help + to send it. (And it may screw up Cygnus KerbNet clients.) + Wed Feb 18 16:04:22 1998 Tom Yu <tlyu@mit.edu> * Makefile.in (thisconfigdir): Remove trailing slash. diff --git a/src/kdc/kdc_preauth.c b/src/kdc/kdc_preauth.c index 2651756a6..b88c77283 100644 --- a/src/kdc/kdc_preauth.c +++ b/src/kdc/kdc_preauth.c @@ -87,6 +87,8 @@ static krb5_error_code get_sam_edata #define PA_HARDWARE 0x00000001 #define PA_REQUIRED 0x00000002 #define PA_SUFFICIENT 0x00000004 + /* Not really a padata, so don't include it in the etype list*/ +#define PA_PSEUDO 0x00000008 static krb5_preauth_systems preauth_systems[] = { { @@ -105,7 +107,7 @@ static krb5_preauth_systems preauth_systems[] = { }, { KRB5_PADATA_PW_SALT, - 0, + PA_PSEUDO, /* Don't include this in the error list */ 0, 0, return_pw_salt @@ -197,6 +199,8 @@ void get_preauth_hint_list(request, client, server, e_data) for (ap = preauth_systems; ap->type != -1; ap++) { if (hw_only && !(ap->flags & PA_HARDWARE)) continue; + if (ap->flags & PA_PSEUDO) + continue; *pa = malloc(sizeof(krb5_pa_data)); if (*pa == 0) goto errout; |