lost last two lines when applied the patch?

[gssapi-openssh.git] / openssh / packet.c

diff --git a/openssh/packet.c b/openssh/packet.c
index 70e0110cbaf877eb115b048434be63f658337729..ee81f686e2a6d53025f520a1456cc886149b07e2 100644 (file)
--- a/openssh/packet.c
+++ b/openssh/packet.c
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.119 2005/07/28 17:36:22 markus Exp $");
+RCSID("$OpenBSD: packet.c,v 1.120 2005/10/30 08:52:17 djm Exp $");
 
 #include "openbsd-compat/sys-queue.h"
 
@@ -572,7 +572,7 @@ packet_send1(void)
        buffer_clear(&outgoing_packet);
 
        /*
-        * Note that the packet is now only buffered in output.  It won\'t be
+        * Note that the packet is now only buffered in output.  It won't be
         * actually sent until packet_write_wait or packet_write_poll is
         * called.
         */
@@ -1546,6 +1546,13 @@ packet_send_ignore(int nbytes)
                rnd >>= 8;
        }
 }
+int rekey_requested = 0;
+
+void
+packet_request_rekeying(void)
+{
+       rekey_requested = 1;
+}
 
 #define MAX_PACKETS    (1U<<31)
 int
@@ -1553,6 +1560,11 @@ packet_need_rekeying(void)
 {
        if (datafellows & SSH_BUG_NOREKEY)
                return 0;
+       if (rekey_requested == 1)
+       {
+               rekey_requested = 0;
+               return 1;
+       }
        return
            (p_send.packets > MAX_PACKETS) ||
            (p_read.packets > MAX_PACKETS) ||