From c44b8a2397ca1df4295f0955b6572f5182228cc8 Mon Sep 17 00:00:00 2001
From: Markus Friedl <mfriedl@gmail.com>
Date: Fri, 6 Jan 2012 14:07:56 +0100
Subject: [PATCH] active_state declaration already in packet.h

---
 ssh/clientloop.c  | 2 --
 ssh/dispatch.c    | 4 ----
 ssh/monitor.c     | 1 -
 ssh/serverloop.c  | 1 -
 ssh/ssh-keyscan.c | 1 -
 ssh/sshconnect2.c | 2 --
 ssh/sshd.c        | 2 --
 7 files changed, 13 deletions(-)

diff --git a/ssh/clientloop.c b/ssh/clientloop.c
index 7086814..fae3ab8 100644
--- a/ssh/clientloop.c
+++ b/ssh/clientloop.c
@@ -183,8 +183,6 @@ TAILQ_HEAD(global_confirms, global_confirm);
 static struct global_confirms global_confirms =
     TAILQ_HEAD_INITIALIZER(global_confirms);
 
-extern struct ssh *active_state;
-
 void ssh_process_session2_setup(int, int, int, Buffer *);
 
 /* Restores stdin to blocking mode. */
diff --git a/ssh/dispatch.c b/ssh/dispatch.c
index c18e3dc..ee6bf83 100644
--- a/ssh/dispatch.c
+++ b/ssh/dispatch.c
@@ -54,25 +54,21 @@ dispatch_protocol_ignore(int type, u_int32_t seq, void *ctxt)
 void
 dispatch_init(dispatch_fn *dflt)
 {
-	extern struct ssh *active_state;
 	ssh_dispatch_init(active_state, dflt);
 }
 void
 dispatch_range(u_int from, u_int to, dispatch_fn *fn)
 {
-	extern struct ssh *active_state;
 	ssh_dispatch_range(active_state, from, to, fn);
 }
 void
 dispatch_set(int type, dispatch_fn *fn)
 {
-	extern struct ssh *active_state;
 	ssh_dispatch_set(active_state, type, fn);
 }
 void
 dispatch_run(int mode, volatile sig_atomic_t *done, void *ctxt)
 {
-	extern struct ssh *active_state;
 	ssh_dispatch_run(active_state, mode, done, ctxt);
 }
 
diff --git a/ssh/monitor.c b/ssh/monitor.c
index 49899b1..c3017fc 100644
--- a/ssh/monitor.c
+++ b/ssh/monitor.c
@@ -82,7 +82,6 @@ static Gssctxt *gsscontext = NULL;
 
 /* Imports */
 extern ServerOptions options;
-extern struct ssh *active_state;
 extern u_int utmp_len;
 extern z_stream incoming_stream;
 extern z_stream outgoing_stream;
diff --git a/ssh/serverloop.c b/ssh/serverloop.c
index ade5365..2f19ecb 100644
--- a/ssh/serverloop.c
+++ b/ssh/serverloop.c
@@ -78,7 +78,6 @@
 
 extern ServerOptions options;
 
-extern struct ssh *active_state;
 extern Authctxt *the_authctxt;
 extern int use_privsep;
 
diff --git a/ssh/ssh-keyscan.c b/ssh/ssh-keyscan.c
index c7c3ab1..5750554 100644
--- a/ssh/ssh-keyscan.c
+++ b/ssh/ssh-keyscan.c
@@ -65,7 +65,6 @@ int maxfd;
 #define MAXCON (maxfd - 10)
 
 extern char *__progname;
-extern struct ssh *active_state;
 fd_set *read_wait;
 size_t read_wait_nfdset;
 int ncon;
diff --git a/ssh/sshconnect2.c b/ssh/sshconnect2.c
index 71a0609..250b25f 100644
--- a/ssh/sshconnect2.c
+++ b/ssh/sshconnect2.c
@@ -86,8 +86,6 @@ u_int session_id2_len = 0;
 char *xxx_host;
 struct sockaddr *xxx_hostaddr;
 
-extern struct ssh *active_state;
-
 static int
 verify_host_key_callback(Key *hostkey, void *ctxt)
 {
diff --git a/ssh/sshd.c b/ssh/sshd.c
index 0c99b4f..d5d900e 100644
--- a/ssh/sshd.c
+++ b/ssh/sshd.c
@@ -174,8 +174,6 @@ int num_listen_socks = 0;
 char *client_version_string = NULL;
 char *server_version_string = NULL;
 
-extern struct ssh *active_state;
-
 /*
  * Any really sensitive data in the application is contained in this
  * structure. The idea is that this structure could be locked into memory so