diff options
| -rw-r--r-- | source4/lib/socket/config.mk | 2 | ||||
| -rw-r--r-- | source4/lib/socket/connect_multi.c | 4 | ||||
| -rw-r--r-- | source4/libcli/config.mk | 7 | ||||
| -rw-r--r-- | source4/libcli/nbt/nbtsocket.c | 2 | ||||
| -rw-r--r-- | source4/torture/config.mk | 9 |
5 files changed, 12 insertions, 12 deletions
diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk index ee630fb227..4c4dbb2915 100644 --- 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 9f060767af..6c3c6a5a66 100644 --- 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 533266dca8..418794ec86 100644 --- 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 eca5253113..1e808e698d 100644 --- 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 efbebc549b..63a1280170 100644 --- 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 ################################# |