diff options
| author |   djm <djm@openbsd.org> | 2008-05-09 14:26:08 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2008-05-09 14:26:08 +0000 |
| commit | 3fef255ca80ab4a81679fa04f992691e00ef94eb (patch) | |
| tree | 2af682e0b35b1ec84112785b8605640a7d38f1d6 /usr.bin/ssh/ssh.c | |
| parent | tidy up session multiplexing code, moving it into its own file and (diff) | |
| download | wireguard-openbsd-3fef255ca80ab4a81679fa04f992691e00ef94eb.tar.xz wireguard-openbsd-3fef255ca80ab4a81679fa04f992691e00ef94eb.zip | |
dingo stole my diff hunk
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 7 |
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 |