libbareos: solve the undefined reference by a weak attribute

- this is probably not protable - GetTlsResourceByFullyQualifiedResourceName is not known when linking libbareos
bareos · Aug 28, 2018 · 051657f · 051657f
1 parent 66c12fb
commit 051657f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/src/lib/parse_conf.h b/core/src/lib/parse_conf.h
@@ -500,7 +500,7 @@ DLL_IMP_EXP void InitResource(int type, ResourceItem *item);
 DLL_IMP_EXP bool SaveResource(int type, ResourceItem *item, int pass);
 DLL_IMP_EXP bool StoreResource(int type, LEX *lc, ResourceItem *item, int index, int pass);
 DLL_IMP_EXP const char *res_to_str(int rcode);
-DLL_IMP_EXP bool GetTlsResourceByFullyQualifiedResourceName(const char *fq_name_, std::string &psk_return_value);
+DLL_IMP_EXP bool GetTlsResourceByFullyQualifiedResourceName(const char *fq_name_, std::string &psk_return_value) __attribute__((weak));
 
 
 #ifdef HAVE_JANSSON

diff --git a/core/src/lib/tls_openssl_private.cc b/core/src/lib/tls_openssl_private.cc
@@ -26,7 +26,7 @@
 #include "lib/bpoll.h"
 #include "lib/crypto_openssl.h"
 
-#include "parse_conf.h"
+#include "lib/parse_conf.h"
 
 #include <bareos.h>
 #include <openssl/err.h>