* 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

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 1301646fa282c163715b352cc375745eb6500f5a..f43d9ee339ee7fc74a8f2dbef52f6d939eb74866 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,10 @@
+2000-09-08  Ken Raeburn  <raeburn@mit.edu>
+
+       * 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.
+
 Tue Aug  8 13:38:22 2000  Ezra Peisach  <epeisach@mit.edu>
 
        * krlogin.c (read_wrapper): Copy from the current point and not

diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in
index 298fb49a81458c02dfe2f189822c206389f77752..1673739594da641f34107098750a279c9cdf2064 100644 (file)
--- a/src/appl/bsd/Makefile.in
+++ b/src/appl/bsd/Makefile.in
@@ -28,7 +28,8 @@ BSD=  -DUCB_RLOGIN=\"$(UCB_RLOGIN)\" \
        -DUCB_RSH=\"$(UCB_RSH)\" -DUCB_RCP=\"$(UCB_RCP)\"
 
 DEFINES = $(RSH) $(BSD) $(RPROGS) \
-       -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -DKPROGDIR=\"$(CLIENT_BINDIR)\"
+       -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" \
+       -DHEIMDAL_FRIENDLY
 
 all:: rsh rcp rlogin kshd klogind login.krb5 $(V4RCP)
 

diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c
index d2748849919840c9febab71cfaa604f0818d7226..b3102bd181f9a27364493d8c9fb402c2903d5060 100644 (file)
--- a/src/appl/bsd/krlogind.c
+++ b/src/appl/bsd/krlogind.c
@@ -1548,8 +1548,13 @@ recvauth(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 permitted under old kcmd protocol");
+#endif
+    }
     if (key == 0)
        key = ticket->enc_part2->session;
 

diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c
index c69729c5c98ec745bef9a92f4fc527b73896abfc..cb745e307c52552963317dd11577a4fc048b173c 100644 (file)
--- 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);