- djm@cvs.openbsd.org 2003/11/23 23:18:45

     [ssh-keygen.c]
     consistency PATH_MAX -> MAXPATHLEN; ok markus@
     (RCS ID sync only)
   - djm@cvs.openbsd.org 2003/11/23 23:21:21
     [scp.c]
     from portable: rename clashing variable limit-> limit_rate; ok markus@
     (RCS ID sync only)

diff --git a/ChangeLog b/ChangeLog
index 677d0d819d93ac70284573a7d0dc106f583043da..fd4e79678dbd69055738f21cc42552d4b7acda11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,14 @@
      [ssh-keyscan.c]
      from portable - use sysconf to detect fd limit; ok markus@
      (tidy diff by adding SSH_SSFDMAX macro to defines.h)
+   - djm@cvs.openbsd.org 2003/11/23 23:18:45
+     [ssh-keygen.c]
+     consistency PATH_MAX -> MAXPATHLEN; ok markus@
+     (RCS ID sync only)
+   - djm@cvs.openbsd.org 2003/11/23 23:21:21
+     [scp.c]
+     from portable: rename clashing variable limit-> limit_rate; ok markus@
+     (RCS ID sync only)
 
 20031122
  - (dtucker) [channels.c] Make AIX write limit code clearer.  Suggested by djm@

diff --git a/scp.c b/scp.c
index 53172c12db830549cf55e6f40093047a241ec47c..1daa2ccf7a26b54c281a479e8a5e35f22de10d2d 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -71,7 +71,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.112 2003/11/21 11:57:03 djm Exp $");
+RCSID("$OpenBSD: scp.c,v 1.113 2003/11/23 23:21:21 djm Exp $");
 
 #include "xmalloc.h"
 #include "atomicio.h"

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 54aa5a59c22c30318fa359e6a1505c275a2c4b3c..961fd43e555484381a43b914198bc4da05b82350 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.111 2003/11/21 11:57:03 djm Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.112 2003/11/23 23:18:45 djm Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/pem.h>