AWK=@AWK@
DYNEXP=@DYNEXP@
PERL=@PERL@
+PYTHON=@PYTHON@
LIBDL=@LIBDL@
PIDL_ARGS=@PIDL_ARGS@
librpc/ndr/util.o \
librpc/gen_ndr/ndr_dcerpc.o
-RPCCLIENT_NDR_OBJ = rpc_client/ndr.o
-
LIBNDR_GEN_OBJ0 = librpc/gen_ndr/ndr_samr.o \
librpc/gen_ndr/ndr_lsa.o
LIBNDR_XATTR_OBJ = librpc/gen_ndr/ndr_xattr.o \
../librpc/ndr/ndr_xattr.o
+LIBCLI_SPOOLSS_OBJ = librpc/gen_ndr/cli_spoolss.o \
+ librpc/gen_ndr/ndr_spoolss_c.o \
+ rpc_client/cli_spoolss.o \
+ rpc_client/init_spoolss.o
+
+LIBCLI_EVENTLOG_OBJ = librpc/gen_ndr/cli_eventlog.o \
+ librpc/gen_ndr/ndr_eventlog_c.o
+
+LIBCLI_WINREG_OBJ = librpc/gen_ndr/cli_winreg.o \
+ librpc/gen_ndr/ndr_winreg_c.o
+
+LIBCLI_NTSVCS_OBJ = librpc/gen_ndr/cli_ntsvcs.o \
+ librpc/gen_ndr/ndr_ntsvcs_c.o
+
+LIBCLI_DRSUAPI_OBJ = librpc/gen_ndr/cli_drsuapi.o \
+ librpc/gen_ndr/ndr_drsuapi_c.o
+
+LIBCLI_DFS_OBJ = librpc/gen_ndr/cli_dfs.o \
+ librpc/gen_ndr/ndr_dfs_c.o
+
+LIBCLI_ECHO_OBJ = librpc/gen_ndr/cli_echo.o \
+ librpc/gen_ndr/ndr_echo_c.o
+
+LIBCLI_INITSHUTDOWN_OBJ = librpc/gen_ndr/cli_initshutdown.o \
+ librpc/gen_ndr/ndr_initshutdown_c.o
+
+LIBCLI_DSSETUP_OBJ = librpc/gen_ndr/cli_dssetup.o \
+ librpc/gen_ndr/ndr_dssetup_c.o
+
LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
$(LIBNDR_GEN_OBJ0) \
librpc/gen_ndr/ndr_dfs.o \
libads/kerberos_util.o \
libads/ldap_user.o \
libads/ads_struct.o libads/kerberos_keytab.o \
- libads/disp_sec.o libads/ads_utils.o libads/ldap_utils.o \
+ libads/disp_sec.o libads/ldap_utils.o \
libads/ldap_schema.o libads/util.o libads/ndr.o
LIBADS_SERVER_OBJ = libads/kerberos_verify.o libads/authdata.o \
LIBMSRPC_OBJ = rpc_client/cli_lsarpc.o rpc_client/cli_samr.o \
$(RPC_CLIENT_OBJ1) \
$(RPC_CLIENT_OBJ) \
- rpc_client/cli_spoolss.o \
- rpc_client/init_spoolss.o \
rpc_client/init_samr.o \
../librpc/rpc/binding.o
DCERPC_CLIENT_GEN_OBJ = \
librpc/gen_ndr/ndr_lsa_c.o \
- librpc/gen_ndr/ndr_dfs_c.o \
- librpc/gen_ndr/ndr_echo_c.o \
librpc/gen_ndr/ndr_srvsvc_c.o \
librpc/gen_ndr/ndr_svcctl_c.o \
- librpc/gen_ndr/ndr_winreg_c.o \
- librpc/gen_ndr/ndr_initshutdown_c.o \
- librpc/gen_ndr/ndr_eventlog_c.o \
librpc/gen_ndr/ndr_wkssvc_c.o \
librpc/gen_ndr/ndr_netlogon_c.o \
librpc/gen_ndr/ndr_samr_c.o \
- librpc/gen_ndr/ndr_dssetup_c.o \
- librpc/gen_ndr/ndr_ntsvcs_c.o \
- librpc/gen_ndr/ndr_epmapper_c.o \
- librpc/gen_ndr/ndr_drsuapi_c.o \
- librpc/gen_ndr/ndr_spoolss_c.o
+ librpc/gen_ndr/ndr_epmapper_c.o
LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_lsa.o \
- librpc/gen_ndr/cli_dfs.o \
- librpc/gen_ndr/cli_echo.o \
librpc/gen_ndr/cli_srvsvc.o \
librpc/gen_ndr/cli_svcctl.o \
- librpc/gen_ndr/cli_winreg.o \
- librpc/gen_ndr/cli_initshutdown.o \
- librpc/gen_ndr/cli_eventlog.o \
librpc/gen_ndr/cli_wkssvc.o \
librpc/gen_ndr/cli_netlogon.o \
librpc/gen_ndr/cli_samr.o \
- librpc/gen_ndr/cli_dssetup.o \
- librpc/gen_ndr/cli_ntsvcs.o \
librpc/gen_ndr/cli_epmapper.o \
- librpc/gen_ndr/cli_drsuapi.o \
- librpc/gen_ndr/cli_spoolss.o \
$(DCERPC_CLIENT_GEN_OBJ) \
../librpc/rpc/dcerpc_util.o \
../librpc/rpc/binding_handle.o \
librpc/rpc/dcerpc_helpers.o \
- $(LIBNDR_GEN_OBJ) \
- $(RPCCLIENT_NDR_OBJ)
+ $(LIBNDR_GEN_OBJ)
#
# registry-related objects
RPC_ECHO_OBJ = rpc_server/srv_echo_nt.o librpc/gen_ndr/srv_echo.o
-RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ) $(NPA_TSTREAM_OBJ)
+RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ) $(NPA_TSTREAM_OBJ) \
+ $(LIBCLI_SPOOLSS_OBJ) \
+ $(LIBCLI_WINREG_OBJ)
RPC_CLIENT_OBJ = rpc_client/cli_pipe.o \
librpc/rpc/dcerpc_gssapi.o \
librpc/rpc/dcerpc_spnego.o \
librpc/rpc/rpc_common.o \
rpc_client/rpc_transport_np.o \
- rpc_client/rpc_transport_sock.o \
- rpc_client/rpc_transport_smbd.o
+ rpc_client/rpc_transport_sock.o
LOCKING_OBJ = locking/locking.o locking/brlock.o locking/posix.o
printing/printspoolss.o \
lib/sysquotas.o lib/sysquotas_linux.o \
lib/sysquotas_xfs.o lib/sysquotas_4A.o \
+ lib/sysquotas_nfs.o \
smbd/fake_file.o \
smbd/quotas.o smbd/ntquotas.o $(AFS_OBJ) smbd/msdfs.o \
$(AFS_SETTOKEN_OBJ) smbd/aio.o smbd/statvfs.o \
$(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
$(READLINE_OBJ) $(GROUPDB_OBJ) $(KRBCLIENT_OBJ) \
$(LIBADS_OBJ) $(POPT_LIB_OBJ) \
- $(SMBLDAP_OBJ) $(DCUTIL_OBJ)
+ $(SMBLDAP_OBJ) $(DCUTIL_OBJ) \
+ $(LIBCLI_SPOOLSS_OBJ) \
+ $(LIBCLI_EVENTLOG_OBJ) \
+ $(LIBCLI_NTSVCS_OBJ) \
+ $(LIBCLI_DRSUAPI_OBJ) \
+ $(LIBCLI_DFS_OBJ) \
+ $(LIBCLI_ECHO_OBJ) \
+ $(LIBCLI_DSSETUP_OBJ)
PAM_WINBIND_OBJ = ../nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
$(LIBREPLACE_OBJ) @BUILD_INIPARSER@
utils/net_eventlog.o \
utils/net_printing.o \
$(LIBNDR_NTPRINTING_OBJ) \
- $(LIBNDR_PREG_OBJ)
-
+ $(LIBNDR_PREG_OBJ) \
+ $(LIBCLI_SPOOLSS_OBJ) \
+ $(LIBCLI_WINREG_OBJ) \
+ $(LIBCLI_DRSUAPI_OBJ) \
+ $(LIBCLI_INITSHUTDOWN_OBJ) \
+ $(LIBCLI_DSSETUP_OBJ)
# these are not processed by make proto
NET_OBJ2 = utils/net_registry_util.o utils/net_help_common.o
$(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \
$(LIBTSOCKET_OBJ)
-IDMAP_OBJ = winbindd/idmap.o winbindd/idmap_util.o @IDMAP_STATIC@
+IDMAP_RW_OBJ = winbindd/idmap_rw.o
+
+IDMAP_OBJ = winbindd/idmap.o winbindd/idmap_util.o $(IDMAP_RW_OBJ) @IDMAP_STATIC@
NSS_INFO_OBJ = winbindd/nss_info.o @NSS_INFO_STATIC@
winbindd/winbindd_check_machine_acct.o \
winbindd/winbindd_change_machine_acct.o \
winbindd/winbindd_ping_dc.o \
- winbindd/winbindd_set_mapping.o \
- winbindd/winbindd_remove_mapping.o \
- winbindd/winbindd_set_hwm.o \
winbindd/winbindd_pam_auth.o \
winbindd/winbindd_pam_auth_crap.o \
winbindd/winbindd_pam_chauthtok.o \
$(RPC_NCACN_NP_INTERNAL) $(RPC_SAMR_OBJ) $(RPC_LSA_OBJ) \
$(AFS_OBJ) $(AFS_SETTOKEN_OBJ) \
$(LIBADS_SERVER_OBJ) \
- $(TDB_VALIDATE_OBJ)
+ $(TDB_VALIDATE_OBJ) \
+ $(LIBCLI_DSSETUP_OBJ)
WBINFO_OBJ = ../nsswitch/wbinfo.o $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
$(POPT_LIB_OBJ) $(AFS_SETTOKEN_OBJ) \
$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
$(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
$(DCUTIL_OBJ) $(LIBADS_OBJ) $(PRIVILEGES_BASIC_OBJ) \
- auth/token_util.o
+ auth/token_util.o \
+ $(LIBCLI_INITSHUTDOWN_OBJ)
LIBNETAPI_SHARED_TARGET=@LIBNETAPI_SHARED_TARGET@
LIBNETAPI_SOVER=@LIBNETAPI_SOVER@
@echo "Building plugin $@"
@$(SHLD_MODULE) $(IDMAP_ADEX_OBJ)
-bin/tdb2.@SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_tdb2.o
+bin/tdb2.@SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_tdb2.o $(IDMAP_RW_OBJ)
@echo "Building plugin $@"
- @$(SHLD_MODULE) winbindd/idmap_tdb2.o
+ @$(SHLD_MODULE) winbindd/idmap_tdb2.o $(IDMAP_RW_OBJ)
-bin/ldap.@SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_ldap.o
+bin/ldap.@SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_ldap.o $(IDMAP_RW_OBJ)
@echo "Building plugin $@"
- @$(SHLD_MODULE) winbindd/idmap_ldap.o
+ @$(SHLD_MODULE) winbindd/idmap_ldap.o $(IDMAP_RW_OBJ)
bin/weird.@SHLIBEXT@: $(BINARY_PREREQS) $(DEVEL_HELP_WEIRD_OBJ)
@echo "Building plugin $@"
S3_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin:$$$(LIB_PATH_VAR)"
-SUBUNIT_FORMATTER = $(PYTHON) $(selftestdir)/format-subunit --immediate
-
test:: all torture timelimit
@LIB_PATH_VAR=$(LIB_PATH_VAR) $(S3_LD_LIBPATH_OVERRIDE) \
SAMBA4SHAREDDIR="$(builddir)/bin/shared" SMBTORTURE4=$(smbtorture4_path) \
+ NSS_WRAPPER_WINBIND_SO_PATH="$(srcdir)/../nsswitch/libnss_winbind.so" \
+ SELFTESTDIR="$(selftestdir)" SELFTESTPREFIX="$(selftest_prefix)" \
+ SOURCEDIR="$(srcdir)" \
+ RUN_FROM_BUILD_FARM="$(RUN_FROM_BUILD_FARM)" \
PERL="$(PERL)" PYTHON="$(PYTHON)" \
- NSS_WRAPPER_WINBIND_SO_PATH="$(srcdir)/@WINBIND_NSS@" \
- $(PERL) $(selftestdir)/selftest.pl \
- --prefix=${selftest_prefix} --target=samba3 \
- --testlist="$(srcdir)/selftest/tests.sh|" \
- --exclude=$(srcdir)/selftest/skip \
- --socket-wrapper $(TESTS) | \
- $(PYTHON) $(selftestdir)/filter-subunit \
- --expected-failures=$(srcdir)/selftest/knownfail | \
- $(SUBUNIT_FORMATTER)
+ $(selftestdir)/s3-selftest.sh
test-%:
$(MAKE) test TESTS=$*
gdbtestenv:
$(MAKE) test SELFTEST_TESTENV=$(SELFTEST_TESTENV) \
- SMBD_VALGRIND="xterm -n smbd -e $(selftestdir)/gdb_run $(S3_LD_LIBPATH_OVERRIDE)" \
- WINBINDD_VALGRIND="xterm -n winbindd -e $(selftestdir)/gdb_run $(S3_LD_LIBPATH_OVERRIDE)" \
+ NMBD_VALGRIND="xterm -n nmbd -title nmbd -e $(selftestdir)/gdb_run $(S3_LD_LIBPATH_OVERRIDE)" \
+ WINBINDD_VALGRIND="xterm -n winbindd -title winbindd -e $(selftestdir)/gdb_run $(S3_LD_LIBPATH_OVERRIDE)" \
+ SMBD_VALGRIND="xterm -n smbd -title smbd -e $(selftestdir)/gdb_run $(S3_LD_LIBPATH_OVERRIDE)" \
+ TESTS="--testenv"
+
+valgrindtestenv:
+ $(MAKE) test SELFTEST_TESTENV=$(SELFTEST_TESTENV) \
+ NMBD_VALGRIND="xterm -n nmbd -title nmbd -e valgrind -q --db-attach=yes --num-callers=30" \
+ WINBINDD_VALGRIND="xterm -n winbindd -title winbindd -e valgrind -q --db-attach=yes --num-callers=30" \
+ SMBD_VALGRIND="xterm -n smbd -title smbd -e valgrind -q --db-attach=yes --num-callers=30" \
TESTS="--testenv"