r15370: Fix more dependencies for shared libs

diff --git a/source/build/smb_build/input.pm b/source/build/smb_build/input.pm
index 0bef89bb5ef16b70a3d2754d25b60f5304ee57a2..16306955a9de3c6ff13a3c0b742fc2a62f6698f8 100644 (file)
--- a/source/build/smb_build/input.pm
+++ b/source/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/source/lib/ldb/tools/cmdline.c b/source/lib/ldb/tools/cmdline.c
index fa01f5c3fb0de1695cd6bd1c52947472b5e933cf..453fc146632a6d0c529fd7f708d7bba3bf1428c8 100644 (file)
--- a/source/lib/ldb/tools/cmdline.c
+++ b/source/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/source/lib/ldb/tools/ldbdel.c b/source/lib/ldb/tools/ldbdel.c
index 749ce3f91c254c8d7b8bc217211ac3c24e72fb24..aee911efaf749edc1b9d88e83349500bf84b8f23 100644 (file)
--- a/source/lib/ldb/tools/ldbdel.c
+++ b/source/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/source/lib/ldb/tools/ldbedit.c b/source/lib/ldb/tools/ldbedit.c
index b4e2b0a8480da5324394c9a2457b2dd31bb77279..f2cbeedb64975ff36b2a2c7b5b72f9c09fab4d65 100644 (file)
--- a/source/lib/ldb/tools/ldbedit.c
+++ b/source/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/source/lib/ldb/tools/ldbmodify.c b/source/lib/ldb/tools/ldbmodify.c
index 4ce49c2ce8136e503f2f7237a966005194c986c0..24f9386266307ccaedfafe15e2ad68fb12491f4b 100644 (file)
--- a/source/lib/ldb/tools/ldbmodify.c
+++ b/source/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/source/lib/ldb/tools/ldbrename.c b/source/lib/ldb/tools/ldbrename.c
index 3229426875774a688da3fea3f1fc2b8575814fb5..9c0870721d487fb6e85aece70c58ba5ab1e8385c 100644 (file)
--- a/source/lib/ldb/tools/ldbrename.c
+++ b/source/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/source/lib/ldb/tools/ldbtest.c b/source/lib/ldb/tools/ldbtest.c
index 5fd75a0cab4c4eb4b23870fb59bd9e8bd47d8b20..c912245682fa39b479e834dfc998c29119231959 100644 (file)
--- a/source/lib/ldb/tools/ldbtest.c
+++ b/source/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/source/lib/registry/tools/regpatch.c b/source/lib/registry/tools/regpatch.c
index 74601d73f9adbd8fe1a25cc14c98058d00b12e52..6e584e90a816bde4ec45b42cc96a9b44e025b193 100644 (file)
--- a/source/lib/registry/tools/regpatch.c
+++ b/source/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/source/lib/registry/tools/regshell.c b/source/lib/registry/tools/regshell.c
index 6bcaf42b6cb0513ac63056c34f73cef45fed3143..dc8ff7723fea8bd301d7aa583199fd29623e7832 100644 (file)
--- a/source/lib/registry/tools/regshell.c
+++ b/source/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/source/nbt_server/config.mk b/source/nbt_server/config.mk
index 701e13225167c1913683b44f90231fcb07c10fdd..94af9366cc1d7283c8b056565323ff54d8a4edfb 100644 (file)
--- a/source/nbt_server/config.mk
+++ b/source/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/source/ntptr/config.mk b/source/ntptr/config.mk
index e6b84c51d0e57ac2cec482a6cec9717964e95f4d..84e6aaffe253989af2cce9e2ea6206065ec8c366 100644 (file)
--- a/source/ntptr/config.mk
+++ b/source/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/source/rpc_server/config.mk b/source/rpc_server/config.mk
index fc96c4f73dbbb9a34b612da639f57f9325c44237..b01b4b0c57c7344a71fd63a1f5dec38ace66ce7f 100644 (file)
--- a/source/rpc_server/config.mk
+++ b/source/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/source/smb_server/config.mk b/source/smb_server/config.mk
index 6130d7ce9f2bbb065e989e354b6cc7bf4fae15f7..6546c544beb1a6136d3ebade7fcaeed0822ea761 100644 (file)
--- a/source/smb_server/config.mk
+++ b/source/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/source/web_server/config.mk b/source/web_server/config.mk
index f6f6113eda953fb76c71ad873c83aac6b190d399..c21e67ed194df602732ec3f3f60754f6ba5ac8ef 100644 (file)
--- a/source/web_server/config.mk
+++ b/source/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/source/winbind/config.mk b/source/winbind/config.mk
index e8c5ea11ce6bf8259c46f0fc0b97a66056daa641..d8dc03622e1fc3193f994667d42b8d61fd869de5 100644 (file)
--- a/source/winbind/config.mk
+++ b/source/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/source/wrepl_server/config.mk b/source/wrepl_server/config.mk
index ee672730b7eeb9dd600710f5d99c6447113f28b6..c8a8164e11be9b7764716a2e71a8efd67cb0fed7 100644 (file)
--- a/source/wrepl_server/config.mk
+++ b/source/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
 #######################