summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2008-05-09 14:26:09 +0000
committerDamien Miller <djm@cvs.openbsd.org>2008-05-09 14:26:09 +0000
commit748153de511cbce99b806c70f20f8bd7a4d1c6a0 (patch)
tree56c79dd5c218c07bc48f6594ce654e6bc4749032 /usr.bin
parentd7f6f9af68596c6939bdc0b00e20a416ecb4ae80 (diff)
dingo stole my diff hunk
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/ssh.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index d71f02f1bba..08cb7c61686 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.312 2008/05/09 14:18:44 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.313 2008/05/09 14:26:08 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -160,6 +160,11 @@ static int client_global_request_id = 0;
/* pid of proxycommand child process */
pid_t proxy_command_pid = 0;
+/* mux.c */
+extern int muxserver_sock;
+extern u_int muxclient_command;
+
+
/* Prints a help message to the user. This function never returns. */
static void