r15344: Fix shared library build

(This used to be commit 7113a16309a83225f3ab6ccbfe48778ae8fc52e8)

diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
index ee630fb227c021394e4ecfb7d29a9ad1715e955a..4c4dbb291517fbd7f0836cc8552f1247d4899c17 100644 (file)
--- a/source4/lib/socket/config.mk
+++ b/source4/lib/socket/config.mk
@@ -41,7 +41,7 @@ OBJ_FILES = \
                access.o \
                connect_multi.o \
                connect.o
-LDFLAGS = $(SUBSYSTEM_LIBCLI_RESOLVE_OUTPUT) $(LIBRARY_LIBCLI_NBT_OUTPUT) $(SUBSYSTEM_NDR_NBT_OUTPUT) $(LIBRARY_NDR_SVCCTL_OUTPUT)
+LDFLAGS = $(SUBSYSTEM_LIBCLI_RESOLVE_OUTPUT) $(SUBSYSTEM_LIBCLI_NBT_OUTPUT) $(SUBSYSTEM_NDR_NBT_OUTPUT) $(LIBRARY_NDR_SVCCTL_OUTPUT)
 PUBLIC_DEPENDENCIES = LIBTALLOC
 PRIVATE_DEPENDENCIES = SOCKET_WRAPPER LIBCLI_COMPOSITE 
 #LIBCLI_RESOLVE

diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c
index 9f060767af6b506d560797fbc20fc153283248a1..6c3c6a5a6631287425a12581f109d5cd14e08f64 100644 (file)
--- a/source4/lib/socket/connect_multi.c
+++ b/source4/lib/socket/connect_multi.c
@@ -63,7 +63,7 @@ static void continue_one(struct composite_context *creq);
 /*
   setup an async socket_connect, with multiple ports
 */
-struct composite_context *socket_connect_multi_send(TALLOC_CTX *mem_ctx,
+_PUBLIC_ struct composite_context *socket_connect_multi_send(TALLOC_CTX *mem_ctx,
                                                    const char *server_address,
                                                    int num_server_ports,
                                                    uint16_t *server_ports,
@@ -243,7 +243,7 @@ static void continue_one(struct composite_context *creq)
 /*
   async recv routine for socket_connect_multi()
  */
-NTSTATUS socket_connect_multi_recv(struct composite_context *ctx,
+_PUBLIC_ NTSTATUS socket_connect_multi_recv(struct composite_context *ctx,
                                   TALLOC_CTX *mem_ctx,
                                   struct socket_context **sock,
                                   uint16_t *port)

diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 533266dca8c578c03c732ec544468a474565882e..418794ec86d23f0105c9c15769118072ca50d91f 100644 (file)
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -114,12 +114,12 @@ OBJ_FILES = clireadwrite.o \
                clideltree.o
 PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
        LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIBSECURITY LIBCLI_RESOLVE \
-       LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS
+       LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS SOCKET
 
 [SUBSYSTEM::LIBCLI_RAW]
 PRIVATE_PROTO_HEADER = raw/raw_proto.h
-PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE
-PUBLIC_DEPENDENCIES = LIBCLI_RAW_KRB5
+PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE 
+PUBLIC_DEPENDENCIES = LIBCLI_RAW_KRB5 SOCKET LIBPACKET gensec LIBCRYPTO
 LDFLAGS = $(SUBSYSTEM_LIBCLI_SMB_COMPOSITE_OUTPUT)
 OBJ_FILES = raw/rawfile.o \
                raw/smb_signing.o \
@@ -142,6 +142,5 @@ OBJ_FILES = raw/rawfile.o \
                raw/rawacl.o \
                raw/rawdate.o \
                raw/rawlpq.o
-PUBLIC_DEPENDENCIES = LIBPACKET gensec LIBCRYPTO
 
 include smb2/config.mk

diff --git a/source4/libcli/nbt/nbtsocket.c b/source4/libcli/nbt/nbtsocket.c
index eca52531138e43cfd538471704556b527af8c7c9..1e808e698d83125c736e7ba1be0bde5515ba26d6 100644 (file)
--- a/source4/libcli/nbt/nbtsocket.c
+++ b/source4/libcli/nbt/nbtsocket.c
@@ -302,7 +302,7 @@ static void nbt_name_socket_handler(struct event_context *ev, struct fd_event *f
   initialise a nbt_name_socket. The event_ctx is optional, if provided
   then operations will use that event context
 */
-struct nbt_name_socket *nbt_name_socket_init(TALLOC_CTX *mem_ctx, 
+_PUBLIC_ struct nbt_name_socket *nbt_name_socket_init(TALLOC_CTX *mem_ctx, 
                                             struct event_context *event_ctx)
 {
        struct nbt_name_socket *nbtsock;

diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index efbebc549beabf9c49095b58de18a265ea867eeb..63a128017027cefb7eb376d2fd3ef3e37d393c26 100644 (file)
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -85,7 +85,7 @@ OBJ_FILES = \
                raw/seek.o \
                raw/composite.o
 PUBLIC_DEPENDENCIES = \
-               LIBCLI_SMB LIBCLI_LSA
+               LIBCLI_SMB LIBCLI_LSA LIBCLI_SMB_COMPOSITE
 # End SUBSYSTEM TORTURE_RAW
 #################################
 
@@ -153,7 +153,8 @@ PUBLIC_DEPENDENCIES = \
                RPC_NDR_MGMT RPC_NDR_NETLOGON RPC_NDR_ATSVC RPC_NDR_DRSUAPI \
                RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_SPOOLSS \
                RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP \
-               RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER WB_HELPER LIBSAMBA-NET
+               RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER WB_HELPER LIBSAMBA-NET \
+               LIBCLI_AUTH
 
 #################################
 # Start SUBSYSTEM TORTURE_RAP
@@ -176,7 +177,7 @@ OBJ_FILES = \
                auth/ntlmssp.o \
                auth/pac.o
 PUBLIC_DEPENDENCIES = \
-               LIBCLI_SMB gensec auth LIBSAMBA3
+               LIBCLI_SMB gensec auth LIBSAMBA3 KERBEROS
 # End SUBSYSTEM TORTURE_AUTH
 #################################
 
@@ -222,7 +223,7 @@ OBJ_FILES = \
                nbt/dgram.o \
                nbt/browse.o
 PUBLIC_DEPENDENCIES = \
-               LIBCLI_SMB LIBCLI_NBT LIBCLI_WREPL
+               LIBCLI_SMB LIBCLI_NBT LIBCLI_DGRAM LIBCLI_WREPL
 # End SUBSYSTEM TORTURE_NBT
 #################################