[openssh-commits] [openssh] 01/04: these need active_state defined to link on OSX

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit ade31d7b6f608a19b85bee29a7a00b1e636a2919
Author: Damien Miller <djm at mindrot.org>
Date:   Tue Jan 27 23:06:23 2015 +1100

    these need active_state defined to link on OSX
    
    temporary measure until active_state goes away entirely
---
 regress/unittests/kex/test_kex.c | 2 ++
 ssh-keyscan.c                    | 2 ++
 ssh-keysign.c                    | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/regress/unittests/kex/test_kex.c b/regress/unittests/kex/test_kex.c
index 72a11f2..762f524 100644
--- a/regress/unittests/kex/test_kex.c
+++ b/regress/unittests/kex/test_kex.c
@@ -20,6 +20,8 @@
 #include "packet.h"
 #include "myproposal.h"
 
+struct ssh *active_state = NULL; /* XXX - needed for linking */
+
 void kex_tests(void);
 static int do_debug = 0;
 
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 62dbd62..25a257c 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -77,6 +77,8 @@ fd_set *read_wait;
 size_t read_wait_nfdset;
 int ncon;
 
+struct ssh *active_state = NULL; /* XXX needed for linking */
+
 /*
  * Keep a connection structure for each file descriptor.  The state
  * associated with file descriptor n is held in fdcon[n].
diff --git a/ssh-keysign.c b/ssh-keysign.c
index 8af13fa..222327e 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -57,6 +57,8 @@
 #include "sshkey.h"
 #include "ssherr.h"
 
+struct ssh *active_state = NULL; /* XXX needed for linking */
+
 /* XXX readconf.c needs these */
 uid_t original_real_uid;
 

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.