diff options
-rw-r--r-- | source3/Makefile.in | 2 | ||||
-rw-r--r-- | source3/torture/torture.c | 2 | ||||
-rw-r--r-- | source3/torture/wbc_async.c (renamed from nsswitch/libwbclient/wbc_async.c) | 2 | ||||
-rw-r--r-- | source3/torture/wbc_async.h (renamed from nsswitch/libwbclient/wbc_async.h) | 0 | ||||
-rw-r--r-- | source3/wscript_build | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index c1b6c8b88b..1104216550 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -1203,7 +1203,7 @@ SMBTORTURE_OBJ1 = torture/torture.o torture/nbio.o torture/scanner.o torture/uta SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(PARAM_OBJ) $(TLDAP_OBJ) \ $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \ @LIBWBCLIENT_STATIC@ \ - ../nsswitch/libwbclient/wbc_async.o \ + torture/wbc_async.o \ ../nsswitch/libwbclient/wb_reqtrans.o \ $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBCLI_ECHO_OBJ) diff --git a/source3/torture/torture.c b/source3/torture/torture.c index 24c7d7bc35..7821f0eaf4 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "nsswitch/libwbclient/wbc_async.h" +#include "wbc_async.h" #include "torture/proto.h" #include "libcli/security/security.h" #include "tldap.h" diff --git a/nsswitch/libwbclient/wbc_async.c b/source3/torture/wbc_async.c index d1dd76d768..182474c216 100644 --- a/nsswitch/libwbclient/wbc_async.c +++ b/source3/torture/wbc_async.c @@ -29,7 +29,7 @@ #include "lib/async_req/async_sock.h" #include "nsswitch/winbind_struct_protocol.h" #include "nsswitch/libwbclient/wbclient.h" -#include "nsswitch/libwbclient/wbc_async.h" +#include "wbc_async.h" wbcErr map_wbc_err_from_errno(int error) { diff --git a/nsswitch/libwbclient/wbc_async.h b/source3/torture/wbc_async.h index 6178bb45e9..6178bb45e9 100644 --- a/nsswitch/libwbclient/wbc_async.h +++ b/source3/torture/wbc_async.h diff --git a/source3/wscript_build b/source3/wscript_build index 4062f51add..9b35af1959 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -618,7 +618,7 @@ SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/ torture/test_posix_append.c''' SMBTORTURE_SRC = '''${SMBTORTURE_SRC1} - ../nsswitch/libwbclient/wbc_async.c + torture/wbc_async.c ../nsswitch/libwbclient/wb_reqtrans.c''' MASKTEST_SRC = '''torture/masktest.c''' |