summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2009-10-07 08:39:57 +1100
committerDarren Tucker <dtucker@zip.com.au>2009-10-07 08:39:57 +1100
commit8ec4fd8e3cf5eaf4791d422df1137ecacebc2a34 (patch)
tree4607d8bd98b3fefbc92c5706d30e28d67fbef508
parentb3b40a8b95b3fc8ca952f0958b966a99f78b2ef2 (diff)
- dtucker@cvs.openbsd.org 2009/08/20 23:54:28
[mux.c] subsystem_flag is defined in ssh.c so it's extern; ok djm
-rw-r--r--ChangeLog3
-rw-r--r--mux.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d2d6862cb..c5ce2aed4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,9 @@
43 - jmc@cvs.openbsd.org 2009/08/19 04:56:03 43 - jmc@cvs.openbsd.org 2009/08/19 04:56:03
44 [sftp.1] 44 [sftp.1]
45 ether -> either; 45 ether -> either;
46 - dtucker@cvs.openbsd.org 2009/08/20 23:54:28
47 [mux.c]
48 subsystem_flag is defined in ssh.c so it's extern; ok djm
46 49
4720091002 5020091002
48 - (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps. 51 - (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps.
diff --git a/mux.c b/mux.c
index 79f83768b..fac43a71f 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: mux.c,v 1.7 2008/06/13 17:21:20 dtucker Exp $ */ 1/* $OpenBSD: mux.c,v 1.8 2009/08/20 23:54:28 dtucker Exp $ */
2/* 2/*
3 * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -85,7 +85,7 @@ extern int tty_flag;
85extern Options options; 85extern Options options;
86extern int stdin_null_flag; 86extern int stdin_null_flag;
87extern char *host; 87extern char *host;
88int subsystem_flag; 88extern int subsystem_flag;
89extern Buffer command; 89extern Buffer command;
90 90
91/* Context for session open confirmation callback */ 91/* Context for session open confirmation callback */