Move wbc_async.[ch] to its only user: smbtorture3

diff --git a/source3/Makefile.in b/source3/Makefile.in
index c1b6c8b88bbb68c4a25d40a608c79a1cf4bb2a3f..11042165500552867bbe9a8b4a7cfd604b09f3db 100644 (file)
--- 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 24c7d7bc354ee0cd0d774106b82adab23dee2f01..7821f0eaf47ce793c74d521748959d3e96f3e23f 100644 (file)
--- 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
similarity index 99%
rename from nsswitch/libwbclient/wbc_async.c
rename to source3/torture/wbc_async.c
index d1dd76d768a976d515f039face1907cf84dd656a..182474c21670048019cab99097e2bcd0b65cb290 100644 (file)
--- 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
similarity index 100%
rename from nsswitch/libwbclient/wbc_async.h
rename to source3/torture/wbc_async.h

diff --git a/source3/wscript_build b/source3/wscript_build
index 4062f51add824d1c5fd4a09c8b1662c1a0ec3a47..9b35af1959d0d307a6fbf014fbcf5e73e8f826d9 100644 (file)
--- 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'''