r19507: Merge my DSO fixes branch. Building Samba's libraries as shared libraries

works again now, by specifying --enable-dso to configure.
(This used to be commit 7a01235067a4800b07b8919a6a475954bfb0b04c)

9 files changed, 22 insertions, 12 deletions

diff --git a/source4/torture/auth/ntlmssp.c b/source4/torture/auth/ntlmssp.c
index ff111faf85e..b6d1ccee625 100644
--- a/source4/torture/auth/ntlmssp.c
+++ b/source4/torture/auth/ntlmssp.c
@@ -118,7 +118,7 @@ static bool torture_ntlmssp_self_check(struct torture_context *tctx)
 	return true;
 }
 
-struct torture_suite *torture_ntlmssp(TALLOC_CTX *mem_ctx)
+_PUBLIC_ struct torture_suite *torture_ntlmssp(TALLOC_CTX *mem_ctx)
 {
 	struct torture_suite *suite = torture_suite_create(mem_ctx, 
 													   "NTLMSSP");
diff --git a/source4/torture/auth/pac.c b/source4/torture/auth/pac.c
index fffec86c0d1..629b573ec3a 100644
--- a/source4/torture/auth/pac.c
+++ b/source4/torture/auth/pac.c
@@ -626,7 +626,7 @@ static bool torture_pac_saved_check(struct torture_context *tctx)
 	return true;
 }
 
-struct torture_suite *torture_pac(TALLOC_CTX *mem_ctx)
+_PUBLIC_ struct torture_suite *torture_pac(TALLOC_CTX *mem_ctx)
 {
 	struct torture_suite *suite = torture_suite_create(mem_ctx, "PAC");
 
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 1edaa694475..630c557d28a 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -14,6 +14,7 @@ PUBLIC_DEPENDENCIES = \
 
 [SUBSYSTEM::TORTURE_UTIL]
 OBJ_FILES = util.o util_smb.o
+PRIVATE_DEPENDENCIES = LIBCLI_RAW
 PUBLIC_PROTO_HEADER = util.h
 PUBLIC_DEPENDENCIES = POPT_CREDENTIALS
 
@@ -50,7 +51,8 @@ OBJ_FILES = \
 		basic/properties.o 
 PUBLIC_DEPENDENCIES = \
 		LIBCLI_SMB POPT_CREDENTIALS \
-		TORTURE_UTIL
+		TORTURE_UTIL LIBCLI_RAW
+PRIVATE_DEPENDENCIES = TORTURE_RAW
 # End SUBSYSTEM TORTURE_BASIC
 #################################
 
@@ -91,6 +93,7 @@ OBJ_FILES = \
 PUBLIC_DEPENDENCIES = \
 		LIBCLI_SMB LIBCLI_LSA LIBCLI_SMB_COMPOSITE \
 		POPT_CREDENTIALS
+PRIVATE_DEPENDENCIES = TORTURE_UTIL
 # End SUBSYSTEM TORTURE_RAW
 #################################
 
@@ -152,6 +155,7 @@ PUBLIC_DEPENDENCIES = \
 		RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP \
 		RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER WB_HELPER LIBSAMBA-NET \
 		LIBCLI_AUTH POPT_CREDENTIALS
+PRIVATE_DEPENDENCIES = TORTURE_LDAP TORTURE_UTIL TORTURE_RAP
 
 #################################
 # Start SUBSYSTEM TORTURE_RAP
@@ -162,6 +166,7 @@ PRIVATE_PROTO_HEADER = \
 		rap/proto.h
 OBJ_FILES = \
 		rap/rap.o
+PRIVATE_DEPENDENCIES = TORTURE_UTIL
 PUBLIC_DEPENDENCIES = \
 		LIBCLI_SMB
 # End SUBSYSTEM TORTURE_RAP
@@ -189,6 +194,7 @@ include local/config.mk
 [MODULE::TORTURE_NBENCH]
 SUBSYSTEM = torture
 INIT_FUNCTION = torture_nbench_init
+PRIVATE_DEPENDENCIES = TORTURE_UTIL 
 PRIVATE_PROTO_HEADER = \
 		nbench/proto.h
 OBJ_FILES = \
@@ -232,6 +238,7 @@ OBJ_FILES = \
 		nbt/nbt.o
 PUBLIC_DEPENDENCIES = \
 		LIBCLI_SMB LIBCLI_NBT LIBCLI_DGRAM LIBCLI_WREPL
+PRIVATE_DEPENDENCIES = torture_rpc
 # End SUBSYSTEM TORTURE_NBT
 #################################
 
@@ -255,6 +262,7 @@ OBJ_FILES = \
 PUBLIC_DEPENDENCIES = \
 		LIBSAMBA-NET \
 		POPT_CREDENTIALS
+PRIVATE_DEPENDENCIES = torture_rpc
 # End SUBSYSTEM TORTURE_NET
 #################################
 
diff --git a/source4/torture/ldap/common.c b/source4/torture/ldap/common.c
index 5b28e825f2b..071f0faa2da 100644
--- a/source4/torture/ldap/common.c
+++ b/source4/torture/ldap/common.c
@@ -39,7 +39,7 @@ NTSTATUS torture_ldap_bind(struct ldap_connection *conn, const char *userdn, con
 	return status;
 }
 
-NTSTATUS torture_ldap_bind_sasl(struct ldap_connection *conn, 
+_PUBLIC_ NTSTATUS torture_ldap_bind_sasl(struct ldap_connection *conn, 
 				struct cli_credentials *creds)
 {
         NTSTATUS status;
@@ -54,7 +54,7 @@ NTSTATUS torture_ldap_bind_sasl(struct ldap_connection *conn,
 }
 
 /* open a ldap connection to a server */
-NTSTATUS torture_ldap_connection(TALLOC_CTX *mem_ctx, struct ldap_connection **conn, 
+_PUBLIC_ NTSTATUS torture_ldap_connection(TALLOC_CTX *mem_ctx, struct ldap_connection **conn, 
 				const char *url)
 {
 	NTSTATUS status;
diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index 9917dcb128a..9e1fe32147a 100644
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -38,7 +38,9 @@ PUBLIC_DEPENDENCIES = \
 		registry \
 		LIBCRYPTO \
 		POPT_CREDENTIALS \
-		TORTURE_UI
+		TORTURE_UI \
+		TORTURE_AUTH \
+		TORTURE_UTIL
 # End SUBSYSTEM TORTURE_LOCAL
 #################################
 
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index f05183a0336..682bfdb0eb0 100644
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -419,7 +419,7 @@ static BOOL test_netserverenum(struct smbcli_tree *tree)
 	return True;
 }
 
-NTSTATUS smbcli_rap_netservergetinfo(struct smbcli_tree *tree,
+_PUBLIC_ NTSTATUS smbcli_rap_netservergetinfo(struct smbcli_tree *tree,
 				     TALLOC_CTX *mem_ctx,
 				     struct rap_WserverGetInfo *r)
 {
diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c
index 26b542c27af..56a49663286 100644
--- a/source4/torture/raw/search.c
+++ b/source4/torture/raw/search.c
@@ -43,7 +43,7 @@ static BOOL single_search_callback(void *private, union smb_search_data *file)
 /*
   do a single file (non-wildcard) search 
 */
-NTSTATUS torture_single_search(struct smbcli_state *cli, 
+_PUBLIC_ NTSTATUS torture_single_search(struct smbcli_state *cli, 
 			       TALLOC_CTX *mem_ctx,
 			       const char *pattern,
 			       enum smb_search_level level,
diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 16060851b25..83ecc4b4c99 100644
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -280,7 +280,7 @@ failed:
 }
 
 
-struct test_join *torture_join_domain(const char *machine_name, 
+_PUBLIC_ struct test_join *torture_join_domain(const char *machine_name, 
 				      uint32_t acct_flags,
 				      struct cli_credentials **machine_credentials)
 {
@@ -462,7 +462,7 @@ NTSTATUS torture_leave_ads_domain(TALLOC_CTX *mem_ctx, struct libnet_JoinDomain
   leave the domain, deleting the machine acct
 */
 
-void torture_leave_domain(struct test_join *join)
+_PUBLIC_ void torture_leave_domain(struct test_join *join)
 {
 	struct samr_DeleteUser d;
 	NTSTATUS status;
@@ -491,7 +491,7 @@ void torture_leave_domain(struct test_join *join)
 /*
   return the dom sid for a test join
 */
-const struct dom_sid *torture_join_sid(struct test_join *join)
+_PUBLIC_ const struct dom_sid *torture_join_sid(struct test_join *join)
 {
 	return join->dom_sid;
 }
diff --git a/source4/torture/util_smb.c b/source4/torture/util_smb.c
index 0fee43f6023..9473ab018bc 100644
--- a/source4/torture/util_smb.c
+++ b/source4/torture/util_smb.c
@@ -462,7 +462,7 @@ NTSTATUS torture_check_ea(struct smbcli_state *cli,
 	return NT_STATUS_EA_CORRUPT_ERROR;
 }
 
-bool torture_open_connection_share(TALLOC_CTX *mem_ctx,
+_PUBLIC_ bool torture_open_connection_share(TALLOC_CTX *mem_ctx,
 				   struct smbcli_state **c, 
 				   const char *hostname, 
 				   const char *sharename,