- dtucker@cvs.openbsd.org 2013/05/16 04:09:14

     [sshd_config.5 servconf.c servconf.h packet.c serverloop.c monitor.c sshd_config
     sshd.c] Add RekeyLimit to sshd with the same syntax as the client allowing
     rekeying based on traffic volume or time.  ok djm@, help & ok jmc@ for the man
     page.

1 files changed, 2 insertions, 2 deletions

diff --git a/packet.c b/packet.c
index dd9d26f5d..a64bbae3c 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.184 2013/05/16 02:00:34 dtucker Exp $ */
+/* $OpenBSD: packet.c,v 1.185 2013/05/16 04:09:13 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1966,7 +1966,7 @@ packet_get_rekey_timeout(void)
 
         seconds = active_state->rekey_time + active_state->rekey_interval -
             time(NULL);
-        return (seconds < 0 ? 0 : seconds);
+        return (seconds <= 0 ? 1 : seconds);
 }
 
 void