summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2015-01-27 23:06:23 +1100
committerDamien Miller <djm@mindrot.org>2015-01-27 23:06:23 +1100
commitade31d7b6f608a19b85bee29a7a00b1e636a2919 (patch)
tree1a150d0fe9460f4983782adba1eecdc27b1bc124
parente56aa87502f22c5844918c10190e8b4f785f067b (diff)
these need active_state defined to link on OSX
temporary measure until active_state goes away entirely
-rw-r--r--regress/unittests/kex/test_kex.c2
-rw-r--r--ssh-keyscan.c2
-rw-r--r--ssh-keysign.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/regress/unittests/kex/test_kex.c b/regress/unittests/kex/test_kex.c
index 72a11f2c6..762f524fb 100644
--- a/regress/unittests/kex/test_kex.c
+++ b/regress/unittests/kex/test_kex.c
@@ -20,6 +20,8 @@
20#include "packet.h" 20#include "packet.h"
21#include "myproposal.h" 21#include "myproposal.h"
22 22
23struct ssh *active_state = NULL; /* XXX - needed for linking */
24
23void kex_tests(void); 25void kex_tests(void);
24static int do_debug = 0; 26static int do_debug = 0;
25 27
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 62dbd62fa..25a257cc2 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -77,6 +77,8 @@ fd_set *read_wait;
77size_t read_wait_nfdset; 77size_t read_wait_nfdset;
78int ncon; 78int ncon;
79 79
80struct ssh *active_state = NULL; /* XXX needed for linking */
81
80/* 82/*
81 * Keep a connection structure for each file descriptor. The state 83 * Keep a connection structure for each file descriptor. The state
82 * associated with file descriptor n is held in fdcon[n]. 84 * associated with file descriptor n is held in fdcon[n].
diff --git a/ssh-keysign.c b/ssh-keysign.c
index 8af13fa89..222327ef1 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -57,6 +57,8 @@
57#include "sshkey.h" 57#include "sshkey.h"
58#include "ssherr.h" 58#include "ssherr.h"
59 59
60struct ssh *active_state = NULL; /* XXX needed for linking */
61
60/* XXX readconf.c needs these */ 62/* XXX readconf.c needs these */
61uid_t original_real_uid; 63uid_t original_real_uid;
62 64