r15370: Fix more dependencies for shared libs

(This used to be commit 9a518661fbb76bf1c153afc6f581e888186dc165)

16 files changed, 21 insertions, 18 deletions

diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index 0bef89bb5e..16306955a9 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -71,6 +71,7 @@ sub check_module($$$)
 
 	if ($mod->{OUTPUT_TYPE} eq "SHARED_LIBRARY") {
 		$mod->{INSTALLDIR} = "MODULESDIR/$mod->{SUBSYSTEM}";
+		push (@{$mod->{PRIVATE_DEPENDENCIES}}, $mod->{SUBSYSTEM});
 	} else { 
 		push (@{$INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTIONS}}, $mod->{INIT_FUNCTION}) if defined($mod->{INIT_FUNCTION});
 	}
diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c
index fa01f5c3fb..453fc14663 100644
--- a/source4/lib/ldb/tools/cmdline.c
+++ b/source4/lib/ldb/tools/cmdline.c
@@ -44,7 +44,7 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb, int argc, const
 #ifdef _SAMBA_BUILD_
 	int r;
 #endif
-        int num_options = 0;
+    int num_options = 0;
 	int opt;
 	struct poptOption popt_options[] = {
 		POPT_AUTOHELP
diff --git a/source4/lib/ldb/tools/ldbdel.c b/source4/lib/ldb/tools/ldbdel.c
index 749ce3f91c..aee911efaf 100644
--- a/source4/lib/ldb/tools/ldbdel.c
+++ b/source4/lib/ldb/tools/ldbdel.c
@@ -73,7 +73,7 @@ static void usage(void)
 	exit(1);
 }
 
- int main(int argc, const char **argv)
+int main(int argc, const char **argv)
 {
 	struct ldb_context *ldb;
 	int ret, i;
diff --git a/source4/lib/ldb/tools/ldbedit.c b/source4/lib/ldb/tools/ldbedit.c
index b4e2b0a848..f2cbeedb64 100644
--- a/source4/lib/ldb/tools/ldbedit.c
+++ b/source4/lib/ldb/tools/ldbedit.c
@@ -272,7 +272,7 @@ static void usage(void)
 	exit(1);
 }
 
- int main(int argc, const char **argv)
+int main(int argc, const char **argv)
 {
 	struct ldb_context *ldb;
 	struct ldb_result *result = NULL;
diff --git a/source4/lib/ldb/tools/ldbmodify.c b/source4/lib/ldb/tools/ldbmodify.c
index 4ce49c2ce8..24f9386266 100644
--- a/source4/lib/ldb/tools/ldbmodify.c
+++ b/source4/lib/ldb/tools/ldbmodify.c
@@ -84,7 +84,7 @@ static int process_file(struct ldb_context *ldb, FILE *f)
 	return count;
 }
 
- int main(int argc, const char **argv)
+int main(int argc, const char **argv)
 {
 	struct ldb_context *ldb;
 	int count=0;
diff --git a/source4/lib/ldb/tools/ldbrename.c b/source4/lib/ldb/tools/ldbrename.c
index 3229426875..9c0870721d 100644
--- a/source4/lib/ldb/tools/ldbrename.c
+++ b/source4/lib/ldb/tools/ldbrename.c
@@ -51,7 +51,7 @@ static void usage(void)
 }
 
 
- int main(int argc, const char **argv)
+int main(int argc, const char **argv)
 {
 	struct ldb_context *ldb;
 	int ret;
diff --git a/source4/lib/ldb/tools/ldbtest.c b/source4/lib/ldb/tools/ldbtest.c
index 5fd75a0cab..c912245682 100644
--- a/source4/lib/ldb/tools/ldbtest.c
+++ b/source4/lib/ldb/tools/ldbtest.c
@@ -371,7 +371,7 @@ static void usage(void)
 	exit(1);
 }
 
- int main(int argc, const char **argv)
+int main(int argc, const char **argv)
 {
 	TALLOC_CTX *mem_ctx = talloc_new(NULL);
 	struct ldb_context *ldb;
diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c
index 74601d73f9..6e584e90a8 100644
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/lib/registry/tools/regpatch.c
@@ -42,13 +42,13 @@ int main(int argc, char **argv)
 		POPT_TABLEEND
 	};
 
-	registry_init();
-
 	pc = poptGetContext(argv[0], argc, (const char **) argv, long_options,0);
 
 	while((opt = poptGetNextOpt(pc)) != -1) {
 	}
 
+	registry_init();
+
 	if (remote) {
 		error = reg_open_remote (&h, NULL, cmdline_credentials, remote, NULL);
 	} else {
diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index 6bcaf42b6c..dc8ff7723f 100644
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -418,13 +418,13 @@ static char **reg_completion(const char *text, int start, int end)
 		POPT_TABLEEND
 	};
 
-	registry_init();
-
 	pc = poptGetContext(argv[0], argc, (const char **) argv, long_options,0);
 	
 	while((opt = poptGetNextOpt(pc)) != -1) {
 	}
 
+	registry_init();
+
 	if (remote) {
 		error = reg_open_remote (&h, NULL, cmdline_credentials, remote, NULL); 
 	} else if (backend) {
diff --git a/source4/nbt_server/config.mk b/source4/nbt_server/config.mk
index 701e132251..94af9366cc 100644
--- a/source4/nbt_server/config.mk
+++ b/source4/nbt_server/config.mk
@@ -68,6 +68,6 @@ OBJ_FILES = \
 		irpc.o
 PRIVATE_PROTO_HEADER = nbt_server_proto.h
 PUBLIC_DEPENDENCIES = \
-		LIBCLI_NBT NBTD_WINS NBTD_DGRAM process_model
+		LIBCLI_NBT NBTD_WINS NBTD_DGRAM process_model service
 # End SUBSYSTEM NBTD
 #######################
diff --git a/source4/ntptr/config.mk b/source4/ntptr/config.mk
index e6b84c51d0..84e6aaffe2 100644
--- a/source4/ntptr/config.mk
+++ b/source4/ntptr/config.mk
@@ -8,7 +8,7 @@ SUBSYSTEM = ntptr
 OBJ_FILES = \
 		simple_ldb/ntptr_simple_ldb.o
 PUBLIC_DEPENDENCIES = \
-		ldb
+		ldb NDR_SPOOLSS
 # End MODULE ntptr_simple_ldb
 ################################################
 
diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
index fc96c4f73d..b01b4b0c57 100644
--- a/source4/rpc_server/config.mk
+++ b/source4/rpc_server/config.mk
@@ -37,7 +37,7 @@ INIT_FUNCTION = dcerpc_server_rpcecho_init
 SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
 		echo/rpc_echo.o
-PUBLIC_DEPENDENCIES = NDR_ECHO
+PUBLIC_DEPENDENCIES = NDR_ECHO 
 # End MODULE dcerpc_rpcecho
 ################################################
 
@@ -218,7 +218,8 @@ OBJ_FILES = \
 PUBLIC_DEPENDENCIES = \
 		LIBCLI_AUTH \
 		LIBNDR \
-		dcerpc
+		dcerpc \
+		service
 #
 # End SUBSYSTEM DCERPC
 ################################################
diff --git a/source4/smb_server/config.mk b/source4/smb_server/config.mk
index 6130d7ce9f..6546c544be 100644
--- a/source4/smb_server/config.mk
+++ b/source4/smb_server/config.mk
@@ -18,7 +18,8 @@ PRIVATE_PROTO_HEADER = smb_server_proto.h
 PUBLIC_DEPENDENCIES = \
 		LIBPACKET \
 		SMB_PROTOCOL \
-		SMB2_PROTOCOL
+		SMB2_PROTOCOL \
+		service
 # End SUBSYSTEM SMB
 #######################
 
diff --git a/source4/web_server/config.mk b/source4/web_server/config.mk
index f6f6113eda..c21e67ed19 100644
--- a/source4/web_server/config.mk
+++ b/source4/web_server/config.mk
@@ -9,6 +9,6 @@ PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = \
 		web_server.o \
 		http.o
-PUBLIC_DEPENDENCIES = ESP LIBTLS smbcalls process_model
+PUBLIC_DEPENDENCIES = ESP LIBTLS smbcalls process_model service
 # End SUBSYSTEM WEB
 #######################
diff --git a/source4/winbind/config.mk b/source4/winbind/config.mk
index e8c5ea11ce..d8dc03622e 100644
--- a/source4/winbind/config.mk
+++ b/source4/winbind/config.mk
@@ -24,7 +24,7 @@ OBJ_FILES = \
 		wb_cmd_list_trustdom.o \
 		wb_pam_auth.o
 PUBLIC_DEPENDENCIES = WB_HELPER RPC_NDR_LSA RPC_NDR_SAMR process_model \
-					  PAM_ERRORS
+					  PAM_ERRORS service
 # End SUBSYSTEM WINBIND
 #######################
 
diff --git a/source4/wrepl_server/config.mk b/source4/wrepl_server/config.mk
index ee672730b7..c8a8164e11 100644
--- a/source4/wrepl_server/config.mk
+++ b/source4/wrepl_server/config.mk
@@ -17,6 +17,6 @@ OBJ_FILES = \
 		wrepl_out_helpers.o
 PRIVATE_PROTO_HEADER = wrepl_server_proto.h
 PUBLIC_DEPENDENCIES = \
-		LIBCLI_WREPL WINSDB process_model
+		LIBCLI_WREPL WINSDB process_model service
 # End SUBSYSTEM WREPL_SRV
 #######################