diff options
| -rw-r--r-- | nsswitch/wb_reqtrans.c (renamed from source3/lib/wb_reqtrans.c) | 2 | ||||
| -rw-r--r-- | nsswitch/wb_reqtrans.h (renamed from source3/lib/wb_reqtrans.h) | 0 | ||||
| -rw-r--r-- | nsswitch/wscript_build | 5 | ||||
| -rw-r--r-- | source3/Makefile.in | 4 | ||||
| -rw-r--r-- | source3/torture/wbc_async.h | 2 | ||||
| -rw-r--r-- | source3/winbindd/winbindd.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_dual.c | 2 | ||||
| -rw-r--r-- | source3/wscript_build | 10 |
8 files changed, 15 insertions, 12 deletions
diff --git a/source3/lib/wb_reqtrans.c b/nsswitch/wb_reqtrans.c index 78f806dc0d..779ef52a92 100644 --- a/source3/lib/wb_reqtrans.c +++ b/nsswitch/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 "lib/wb_reqtrans.h" +#include "nsswitch/wb_reqtrans.h" /* can't use DEBUG here... */ #define DEBUG(a,b) diff --git a/source3/lib/wb_reqtrans.h b/nsswitch/wb_reqtrans.h index 941edf659a..941edf659a 100644 --- a/source3/lib/wb_reqtrans.h +++ b/nsswitch/wb_reqtrans.h diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build index a81b01bcbd..6087eda18e 100644 --- a/nsswitch/wscript_build +++ b/nsswitch/wscript_build @@ -34,3 +34,8 @@ if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'): source='winbind_krb5_locator.c', deps='wbclient krb5', realname='winbind_krb5_locator.so') + +bld.SAMBA_SUBSYSTEM('WB_REQTRANS', + source='wb_reqtrans.c', + deps='talloc tevent LIBASYNC_REQ' + ) diff --git a/source3/Makefile.in b/source3/Makefile.in index eb6d4a721f..8140f0aa21 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -1217,7 +1217,7 @@ SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(PARAM_OBJ) $(TLDAP_OBJ) \ $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \ @LIBWBCLIENT_STATIC@ \ torture/wbc_async.o \ - lib/wb_reqtrans.o \ + ../nsswitch/wb_reqtrans.o \ $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBCLI_ECHO_OBJ) MASKTEST_OBJ = torture/masktest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \ @@ -1411,7 +1411,7 @@ WINBINDD_OBJ1 = \ auth/server_info_sam.o \ auth/user_info.o \ auth/pampass.o \ - lib/wb_reqtrans.o + ../nsswitch/wb_reqtrans.o WINBINDD_OBJ = \ $(WINBINDD_OBJ1) $(PASSDB_OBJ) $(GROUPDB_OBJ) \ diff --git a/source3/torture/wbc_async.h b/source3/torture/wbc_async.h index 6a49511671..9cd6a93692 100644 --- 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 "lib/wb_reqtrans.h" +#include "nsswitch/wb_reqtrans.h" struct wb_context; struct winbindd_request; diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c index 3a762316d2..92ae12fe76 100644 --- 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 "lib/wb_reqtrans.h" +#include "nsswitch/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 6465d849dd..bf9fd13949 100644 --- a/source3/winbindd/winbindd_dual.c +++ b/source3/winbindd/winbindd_dual.c @@ -29,7 +29,7 @@ #include "includes.h" #include "winbindd.h" -#include "lib/wb_reqtrans.h" +#include "nsswitch/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 db7cfc313a..2977eeb010 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -382,8 +382,7 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c auth/server_info.c auth/server_info_sam.c auth/user_info.c - auth/user_util.c - lib/wb_reqtrans.c''' + auth/user_util.c''' WINBINDD_SRC = '''${WINBINDD_SRC1} ${TDB_VALIDATE_SRC}''' @@ -613,8 +612,7 @@ SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/ torture/test_smbsock_any_connect.c''' SMBTORTURE_SRC = '''${SMBTORTURE_SRC1} - torture/wbc_async.c - lib/wb_reqtrans.c''' + torture/wbc_async.c''' MASKTEST_SRC = '''torture/masktest.c''' @@ -1114,7 +1112,7 @@ bld.SAMBA_BINARY('winbindd/winbindd', LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON RPC_NDR_DSSETUP NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON RPC_NCACN_NP RPC_PIPE_REGISTER RPC_SAMR RPC_LSARPC - PAM_ERRORS + PAM_ERRORS WB_REQTRANS ''', enabled=bld.env.build_winbind, install_path='${SBINDIR}', @@ -1233,7 +1231,7 @@ bld.SAMBA_BINARY('nmblookup', bld.SAMBA_BINARY('smbtorture', source=SMBTORTURE_SRC, deps='''talloc tdb tevent cap resolv wbclient PARAM LIBSMB KRBCLIENT TLDAP - LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_LSA LIBMSRPC LIBMSRPC_GEN RPC_NDR_ECHO''', + LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_LSA LIBMSRPC LIBMSRPC_GEN RPC_NDR_ECHO WB_REQTRANS''', vars=locals()) bld.SAMBA_BINARY('smbconftort', |