summaryrefslogtreecommitdiff
path: root/src/global.c
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@dwim.me>2016-03-03 22:26:31 +0100
committerCarlos Martín Nieto <cmn@dwim.me>2016-03-03 22:26:31 +0100
commit22f3d3aa6b2500a0c587938f7939c05a28afacf2 (patch)
treeb05d36e992c8321a528d0705ce6b22966b9a72a5 /src/global.c
parent839bdb05a0a2957c0362cdbab219dcfa463a0e94 (diff)
downloadlibgit2-22f3d3aa6b2500a0c587938f7939c05a28afacf2.tar.gz
ssh: initialize libssh2cmn/init-libssh2
We should have been doing this, but it initializes itself upon first use, which works as long as nobody's doing concurrent network operations. Initialize it on our init to make sure it's not getting initialized concurrently.
Diffstat (limited to 'src/global.c')
-rw-r--r--src/global.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/global.c b/src/global.c
index c65b21a11..0bfde1e04 100644
--- a/src/global.c
+++ b/src/global.c
@@ -12,6 +12,7 @@
#include "openssl_stream.h"
#include "thread-utils.h"
#include "git2/global.h"
+#include "transports/ssh.h"
#if defined(GIT_MSVC_CRTDBG)
#include "win32/w32_stack.h"
@@ -56,7 +57,8 @@ static int init_common(void)
/* Initialize any other subsystems that have global state */
if ((ret = git_hash_global_init()) == 0 &&
(ret = git_sysdir_global_init()) == 0 &&
- (ret = git_filter_global_init()) == 0)
+ (ret = git_filter_global_init()) == 0 &&
+ (ret = git_transport_ssh_global_init()) == 0)
ret = git_openssl_stream_global_init();
GIT_MEMORY_BARRIER;