From dc70857773267f4832ac159c2f98db125f25f419 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 14 Jan 2003 22:24:05 +1100 Subject: [PATCH] - djm@cvs.openbsd.org 2003/01/13 11:04:04 [sftp-int.c] make cmds[] array static to avoid conflict with BSDI libc. --- ChangeLog | 5 ++++- sftp-int.c | 4 ++-- 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 @@ - markus@cvs.openbsd.org 2003/01/12 16:57:02 [progressmeter.c] allow WARNINGS=yes; ok djm@ + - djm@cvs.openbsd.org 2003/01/13 11:04:04 + [sftp-int.c] + make cmds[] array static to avoid conflict with BSDI libc. 20030113 - (djm) Rework openbsd-compat/setproctitle.c a bit: move emulation type @@ -1013,4 +1016,4 @@ save auth method before monitor_reset_key_state(); bugzilla bug #284; ok provos@ -$Id: ChangeLog,v 1.2569 2003/01/14 11:23:23 djm Exp $ +$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 @@ /* XXX: recursive operations */ #include "includes.h" -RCSID("$OpenBSD: sftp-int.c,v 1.53 2003/01/10 23:23:24 fgsch Exp $"); +RCSID("$OpenBSD: sftp-int.c,v 1.54 2003/01/13 11:04:04 djm Exp $"); #include "buffer.h" #include "xmalloc.h" @@ -83,7 +83,7 @@ struct CMD { const int n; }; -const struct CMD cmds[] = { +static const struct CMD cmds[] = { { "bye", I_QUIT }, { "cd", I_CHDIR }, { "chdir", I_CHDIR },