summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-11-24 13:09:27 +1100
committerDamien Miller <djm@mindrot.org>2003-11-24 13:09:27 +1100
commita4b33dfb6dff6bebb8f08f72eabaa796aa8bb7d4 (patch)
tree93ae4af26e920793fe3de1fdb4c1e233c04b8eb8
parente00074a7267a2a73a75003dadf43459b7191349b (diff)
- 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)
-rw-r--r--ChangeLog10
-rw-r--r--scp.c2
-rw-r--r--ssh-keygen.c2
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c04479d7b..1bc08b3e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,14 @@
6 [ssh-keyscan.c] 6 [ssh-keyscan.c]
7 from portable - use sysconf to detect fd limit; ok markus@ 7 from portable - use sysconf to detect fd limit; ok markus@
8 (tidy diff by adding SSH_SSFDMAX macro to defines.h) 8 (tidy diff by adding SSH_SSFDMAX macro to defines.h)
9 - djm@cvs.openbsd.org 2003/11/23 23:18:45
10 [ssh-keygen.c]
11 consistency PATH_MAX -> MAXPATHLEN; ok markus@
12 (RCS ID sync only)
13 - djm@cvs.openbsd.org 2003/11/23 23:21:21
14 [scp.c]
15 from portable: rename clashing variable limit-> limit_rate; ok markus@
16 (RCS ID sync only)
9 17
1020031122 1820031122
11 - (dtucker) [channels.c] Make AIX write limit code clearer. Suggested by djm@ 19 - (dtucker) [channels.c] Make AIX write limit code clearer. Suggested by djm@
@@ -1519,4 +1527,4 @@
1519 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1527 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1520 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1528 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1521 1529
1522$Id: ChangeLog,v 1.3127 2003/11/24 02:07:45 djm Exp $ 1530$Id: ChangeLog,v 1.3128 2003/11/24 02:09:27 djm Exp $
diff --git a/scp.c b/scp.c
index 53172c12d..1daa2ccf7 100644
--- a/scp.c
+++ b/scp.c
@@ -71,7 +71,7 @@
71 */ 71 */
72 72
73#include "includes.h" 73#include "includes.h"
74RCSID("$OpenBSD: scp.c,v 1.112 2003/11/21 11:57:03 djm Exp $"); 74RCSID("$OpenBSD: scp.c,v 1.113 2003/11/23 23:21:21 djm Exp $");
75 75
76#include "xmalloc.h" 76#include "xmalloc.h"
77#include "atomicio.h" 77#include "atomicio.h"
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 54aa5a59c..961fd43e5 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: ssh-keygen.c,v 1.111 2003/11/21 11:57:03 djm Exp $"); 15RCSID("$OpenBSD: ssh-keygen.c,v 1.112 2003/11/23 23:18:45 djm Exp $");
16 16
17#include <openssl/evp.h> 17#include <openssl/evp.h>
18#include <openssl/pem.h> 18#include <openssl/pem.h>