wb_reqtrans is not used in libwbclient

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 11042165500552867bbe9a8b4a7cfd604b09f3db..8a150f206471f6d20936422e54b4168e526134cf 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1204,7 +1204,7 @@ SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(PARAM_OBJ) $(TLDAP_OBJ) \
        $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \
        @LIBWBCLIENT_STATIC@ \
         torture/wbc_async.o \
-        ../nsswitch/libwbclient/wb_reqtrans.o \
+        lib/wb_reqtrans.o \
        $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBCLI_ECHO_OBJ)
 
 MASKTEST_OBJ = torture/masktest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
@@ -1400,7 +1400,7 @@ WINBINDD_OBJ1 = \
                auth/server_info_sam.o \
                auth/user_info.o \
                auth/pampass.o \
-               ../nsswitch/libwbclient/wb_reqtrans.o
+               lib/wb_reqtrans.o
 
 WINBINDD_OBJ = \
                $(WINBINDD_OBJ1) $(PASSDB_OBJ) $(GROUPDB_OBJ) \

diff --git a/nsswitch/libwbclient/wb_reqtrans.c b/source3/lib/wb_reqtrans.c
similarity index 99%
rename from nsswitch/libwbclient/wb_reqtrans.c
rename to source3/lib/wb_reqtrans.c
index 753b08ed57e1f57008f4eb5d514d338ae4359226..78f806dc0d6ddc284d94b976afd844975745f902 100644 (file)
--- a/nsswitch/libwbclient/wb_reqtrans.c
+++ b/source3/lib/wb_reqtrans.c
@@ -32,7 +32,7 @@
 #include "lib/util/tevent_unix.h"
 #include "nsswitch/winbind_struct_protocol.h"
 #include "nsswitch/libwbclient/wbclient.h"
-#include "nsswitch/libwbclient/wb_reqtrans.h"
+#include "lib/wb_reqtrans.h"
 
 /* can't use DEBUG here... */
 #define DEBUG(a,b)

diff --git a/nsswitch/libwbclient/wb_reqtrans.h b/source3/lib/wb_reqtrans.h
similarity index 100%
rename from nsswitch/libwbclient/wb_reqtrans.h
rename to source3/lib/wb_reqtrans.h

diff --git a/source3/torture/wbc_async.h b/source3/torture/wbc_async.h
index 6178bb45e9e084e8d8415665550d46add1288bd9..6a49511671e8639569605c08cc7c437f7250e939 100644 (file)
--- a/source3/torture/wbc_async.h
+++ b/source3/torture/wbc_async.h
@@ -27,7 +27,7 @@
 #include <talloc.h>
 #include <tevent.h>
 #include "nsswitch/libwbclient/wbclient.h"
-#include "nsswitch/libwbclient/wb_reqtrans.h"
+#include "lib/wb_reqtrans.h"
 
 struct wb_context;
 struct winbindd_request;

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 98cc8e6bbfe67f3550109be79c47a003660e7d3e..e5aeca6830451ed169e67da4fb955af0e2a1274a 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -26,7 +26,7 @@
 #include "popt_common.h"
 #include "winbindd.h"
 #include "nsswitch/winbind_client.h"
-#include "../../nsswitch/libwbclient/wb_reqtrans.h"
+#include "lib/wb_reqtrans.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "../librpc/gen_ndr/srv_lsa.h"
 #include "../librpc/gen_ndr/srv_samr.h"

diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 0abe7cdc8bf2f609b3680a9a0cac47e2dc7e1901..0d28d9cdd892fc4ea5a4ea7fd977b775f160508e 100644 (file)
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -29,7 +29,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "../../nsswitch/libwbclient/wb_reqtrans.h"
+#include "lib/wb_reqtrans.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "secrets.h"
 #include "../lib/util/select.h"

diff --git a/source3/wscript_build b/source3/wscript_build
index 9b35af1959d0d307a6fbf014fbcf5e73e8f826d9..dd8fffe43551961dffd879d1881c31674811fc7c 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -384,7 +384,7 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
                    auth/server_info_sam.c
                    auth/user_info.c
                    auth/user_util.c
-                   ../nsswitch/libwbclient/wb_reqtrans.c'''
+                   lib/wb_reqtrans.c'''
 
 WINBINDD_SRC = '''${WINBINDD_SRC1}
                   ${TDB_VALIDATE_SRC}
@@ -619,7 +619,7 @@ SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/
 
 SMBTORTURE_SRC = '''${SMBTORTURE_SRC1}
         torture/wbc_async.c
-        ../nsswitch/libwbclient/wb_reqtrans.c'''
+        lib/wb_reqtrans.c'''
 
 MASKTEST_SRC = '''torture/masktest.c'''