summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-01-14 22:24:05 +1100
committerDamien Miller <djm@mindrot.org>2003-01-14 22:24:05 +1100
commitdc70857773267f4832ac159c2f98db125f25f419 (patch)
tree77412c0913021a6edbaacb53e446fa36331779e3
parent71a51415348921728b5b41ac45003858436634c3 (diff)
- djm@cvs.openbsd.org 2003/01/13 11:04:04
[sftp-int.c] make cmds[] array static to avoid conflict with BSDI libc.
-rw-r--r--ChangeLog5
-rw-r--r--sftp-int.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 46333ce13..d0a3754f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
10 - markus@cvs.openbsd.org 2003/01/12 16:57:02 10 - markus@cvs.openbsd.org 2003/01/12 16:57:02
11 [progressmeter.c] 11 [progressmeter.c]
12 allow WARNINGS=yes; ok djm@ 12 allow WARNINGS=yes; ok djm@
13 - djm@cvs.openbsd.org 2003/01/13 11:04:04
14 [sftp-int.c]
15 make cmds[] array static to avoid conflict with BSDI libc.
13 16
1420030113 1720030113
15 - (djm) Rework openbsd-compat/setproctitle.c a bit: move emulation type 18 - (djm) Rework openbsd-compat/setproctitle.c a bit: move emulation type
@@ -1013,4 +1016,4 @@
1013 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1016 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1014 ok provos@ 1017 ok provos@
1015 1018
1016$Id: ChangeLog,v 1.2569 2003/01/14 11:23:23 djm Exp $ 1019$Id: ChangeLog,v 1.2570 2003/01/14 11:24:05 djm Exp $
diff --git a/sftp-int.c b/sftp-int.c
index 111d19031..3438fdeb0 100644
--- a/sftp-int.c
+++ b/sftp-int.c
@@ -25,7 +25,7 @@
25/* XXX: recursive operations */ 25/* XXX: recursive operations */
26 26
27#include "includes.h" 27#include "includes.h"
28RCSID("$OpenBSD: sftp-int.c,v 1.53 2003/01/10 23:23:24 fgsch Exp $"); 28RCSID("$OpenBSD: sftp-int.c,v 1.54 2003/01/13 11:04:04 djm Exp $");
29 29
30#include "buffer.h" 30#include "buffer.h"
31#include "xmalloc.h" 31#include "xmalloc.h"
@@ -83,7 +83,7 @@ struct CMD {
83 const int n; 83 const int n;
84}; 84};
85 85
86const struct CMD cmds[] = { 86static const struct CMD cmds[] = {
87 { "bye", I_QUIT }, 87 { "bye", I_QUIT },
88 { "cd", I_CHDIR }, 88 { "cd", I_CHDIR },
89 { "chdir", I_CHDIR }, 89 { "chdir", I_CHDIR },