diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2000-09-09 00:18:20 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2000-09-09 00:18:20 +0000 |
| commit | 2013f0c63f312d28c0503a722e805c6852936d93 (patch) | |
| tree | 8c1ba858cd6a29fd4d65572df537791b9e120928 /src/appl/bsd/krshd.c | |
| parent | f121e2fbb58aeb1c9f113c5756bccf369c22e277 (diff) | |
| download | krb5-2013f0c63f312d28c0503a722e805c6852936d93.tar.gz krb5-2013f0c63f312d28c0503a722e805c6852936d93.tar.xz krb5-2013f0c63f312d28c0503a722e805c6852936d93.zip | |
* Makefile.in (DEFINES): Define HEIMDAL_FRIENDLY.
* krlogind.c (recvauth): Don't complain about a subkey sent for KCMDV0.1 if
HEIMDAL_FRIENDLY is defined, just quietly ignore it.
* krshd.c (recvauth): Likewise.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12646 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/appl/bsd/krshd.c')
| -rw-r--r-- | src/appl/bsd/krshd.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c index c69729c5c..cb745e307 100644 --- a/src/appl/bsd/krshd.c +++ b/src/appl/bsd/krshd.c @@ -1957,8 +1957,13 @@ recvauth(netf, peersin, valid_checksum) fatal (netf, "Server can't get session subkey"); if (!key && do_encrypt && kcmd_proto == KCMD_NEW_PROTOCOL) fatal (netf, "No session subkey sent"); - if (key && kcmd_proto == KCMD_OLD_PROTOCOL) + if (key && kcmd_proto == KCMD_OLD_PROTOCOL) { +#ifdef HEIMDAL_FRIENDLY + key = 0; +#else fatal (netf, "Session subkey not allowed in old kcmd protocol"); +#endif + } if (key == 0) key = ticket->enc_part2->session; rcmd_stream_init_krb5 (key, do_encrypt, 0, 0, kcmd_proto); |