summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-11 13:38:54 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:49:26 +0100
commit1ea47faa979ad2e4aa4cf1f4252aa33aef98dbd8 (patch)
tree14b9839ca1707722021b59eac400ac47bdd06089 /source4/lib
parentcbefb1347482a0c9c91e73e5d3d2e9e8c7a8e555 (diff)
downloadsamba-1ea47faa979ad2e4aa4cf1f4252aa33aef98dbd8.tar.gz
samba-1ea47faa979ad2e4aa4cf1f4252aa33aef98dbd8.tar.bz2
samba-1ea47faa979ad2e4aa4cf1f4252aa33aef98dbd8.zip
r26397: Fix circular dependency in samba-socket.
(This used to be commit 801c8c766cb6a104751be8829593e0e123508134)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/socket/config.mk4
-rw-r--r--source4/lib/socket/connect.c2
-rw-r--r--source4/lib/socket/testsuite.c2
3 files changed, 3 insertions, 5 deletions
diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
index d1e0bcfef5..fe64c90b81 100644
--- a/source4/lib/socket/config.mk
+++ b/source4/lib/socket/config.mk
@@ -39,9 +39,7 @@ OBJ_FILES = \
access.o \
connect_multi.o \
connect.o
-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
+PRIVATE_DEPENDENCIES = SOCKET_WRAPPER LIBCLI_COMPOSITE LIBCLI_RESOLVE
# End SUBSYSTEM SOCKET
################################################
diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index e70d091275..bc3aca3c22 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -123,7 +123,7 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
set_blocking(socket_get_fd(sock), false);
- if (server_address->addr && strcmp(sock->backend_name, "ipv4") == 0) {
+ if (resolve_ctx && server_address->addr && strcmp(sock->backend_name, "ipv4") == 0) {
struct nbt_name name;
struct composite_context *creq;
make_nbt_name_client(&name, server_address->addr);
diff --git a/source4/lib/socket/testsuite.c b/source4/lib/socket/testsuite.c
index 874508aaa7..edbe617aa0 100644
--- a/source4/lib/socket/testsuite.c
+++ b/source4/lib/socket/testsuite.c
@@ -147,7 +147,7 @@ static bool test_tcp(struct torture_context *tctx)
torture_comment(tctx, "server port is %d\n", srv_addr->port);
- status = socket_connect_ev(sock2, NULL, srv_addr, 0, lp_resolve_context(tctx->lp_ctx), ev);
+ status = socket_connect_ev(sock2, NULL, srv_addr, 0, NULL, ev);
torture_assert_ntstatus_ok(tctx, status, "connect() on socket 2");
status = socket_accept(sock1, &sock3);