The branch, master has been updated via 45082a8 s4-torture: Improve torture test boilerplate, use torture_assert() via 8c52d1b s4-torture: Always use torture_assert() to handle failures via e919cad s4-torture: provide correct torture failures for failure to connect via 8e5badc build: Also look for iconv in /usr/local by default via 4626f25 Add include/lib folders from the commandline via 975e799 s4-torture: Fix rpc.samr.priv test to use torture_assert() macros via ae338bf autobuild: Run ABI check on samba4-libs as well. via 611ca8e build: Move generated files out of the normal build tree via 584a51b build: Move generated version.h to a waf-invisible location from 01c502d pygensec: Fix init of variable if not specified.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 45082a88c7aaaa928ca36003ade071aafe4de54d Author: Andrew Bartlett <abart...@samba.org> Date: Fri May 18 15:43:31 2012 +1000 s4-torture: Improve torture test boilerplate, use torture_assert() This ensures that if this fails, it is reported as a subunit error correctly. Andrew Bartlett Autobuild-User: Andrew Bartlett <abart...@samba.org> Autobuild-Date: Fri May 18 09:35:13 CEST 2012 on sn-devel-104 commit 8c52d1b8ac7d56eb728e4cc4ed2a560365d374b5 Author: Andrew Bartlett <abart...@samba.org> Date: Fri May 18 15:06:28 2012 +1000 s4-torture: Always use torture_assert() to handle failures commit e919cadcca063a4cb1a76a3c30b15f056a51e16d Author: Andrew Bartlett <abart...@samba.org> Date: Fri May 18 14:22:27 2012 +1000 s4-torture: provide correct torture failures for failure to connect commit 8e5badc2564019bc2d8b923971bd37bd8e5bb039 Author: Andrew Bartlett <abart...@samba.org> Date: Fri May 18 08:28:18 2012 +1000 build: Also look for iconv in /usr/local by default This should help the build find iconv on FreeBSD and similar systems, and make it possible to operate with 8-bit character sets. Andrew Bartlett commit 4626f25b5353c4c648e9403c6593feb2c9a2e347 Author: Thomas Nagy <tnagy2po...@gmail.com> Date: Thu May 17 14:49:08 2012 +0200 Add include/lib folders from the commandline By using opt.add_option(..., match=['Checking for library iconv'], dest='iconvdir'), all configuration tests displaying 'Checking for library iconv' will get $(iconvdir)/lib and $(iconvdir)/include commit 975e799e866b4d97b71a7bf3ddabf7c19f8a9f87 Author: Andrew Bartlett <abart...@samba.org> Date: Thu May 17 13:10:31 2012 +1000 s4-torture: Fix rpc.samr.priv test to use torture_assert() macros commit ae338bf3f532c0bd5956e2ad9c2747ebd66bb49c Author: Andrew Bartlett <abart...@samba.org> Date: Thu May 17 13:21:57 2012 +1000 autobuild: Run ABI check on samba4-libs as well. Because this build is without the developer options (so as to check that we build without those) we do not do an ABI check by default. Andrew Bartlett commit 611ca8e8196738345de3596ca61e75fe5a895c26 Author: Andrew Bartlett <abart...@samba.org> Date: Thu May 17 11:12:07 2012 +1000 build: Move generated files out of the normal build tree This avoids some dual-build-system interactions. Andrew Bartlett commit 584a51b2ca891c5546c7e9ee8f039bfeb4d6a319 Author: Andrew Bartlett <abart...@samba.org> Date: Thu May 17 16:43:48 2012 +1000 build: Move generated version.h to a waf-invisible location Generally, it is better if our generated header files for the autoconf build do not end up in places that the waf build can see. Andrew Bartlett ----------------------------------------------------------------------- Summary of changes: .gitignore | 4 +- buildtools/wafsamba/samba_conftests.py | 67 ++++++++++++- buildtools/wafsamba/wscript | 5 + examples/VFS/Makefile.in | 1 + script/autobuild.py | 10 +- source3/Makefile.in | 170 ++++++++++++++++---------------- source3/autoconf/librpc/gen_ndr/README | 7 ++ source3/autogen.sh | 4 +- source3/script/mkversion.sh | 2 +- source4/torture/basic/delaywrite.c | 64 +++--------- source4/torture/basic/disconnect.c | 4 +- source4/torture/basic/locking.c | 19 ++--- source4/torture/raw/chkpath.c | 4 +- source4/torture/raw/context.c | 24 +---- source4/torture/raw/eas.c | 8 +- source4/torture/raw/ioctl.c | 4 +- source4/torture/raw/lock.c | 44 ++------ source4/torture/raw/mkdir.c | 4 +- source4/torture/raw/mux.c | 4 +- source4/torture/raw/open.c | 64 +++--------- source4/torture/raw/oplock.c | 8 +- source4/torture/raw/read.c | 20 +--- source4/torture/raw/rename.c | 16 +--- source4/torture/raw/search.c | 28 ++---- source4/torture/raw/setfileinfo.c | 12 +-- source4/torture/raw/streams.c | 52 +++------- source4/torture/raw/unlink.c | 8 +- source4/torture/rpc/samr_priv.c | 67 +++---------- source4/torture/util_smb.c | 20 ++-- 29 files changed, 299 insertions(+), 445 deletions(-) create mode 100644 source3/autoconf/librpc/gen_ndr/README Changeset truncated at 500 lines: diff --git a/.gitignore b/.gitignore index d8cb4e7..3ed34a3 100644 --- a/.gitignore +++ b/.gitignore @@ -76,12 +76,12 @@ source3/include/autoconf/config.h source3/include/autoconf/config.h.in source3/include/includes.h.gch source3/include/stamp-h -source3/include/version.h +source3/include/autoconf/version.h source3/lib/netapi/examples/Makefile source3/lib/netapi/tests/Makefile source3/library-versions librpc/gen_ndr/*.* -source3/librpc/gen_ndr/*.* +source3/autoconf/librpc/gen_ndr/*.* source3/nsswitch/*.so source3/pkgconfig/*.pc source3/proto_exists diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py index 1838b57..3605e33 100644 --- a/buildtools/wafsamba/samba_conftests.py +++ b/buildtools/wafsamba/samba_conftests.py @@ -1,10 +1,75 @@ # a set of config tests that use the samba_autoconf functions # to test for commonly needed configuration options -import os, Build, shutil, Utils, re +import os, shutil, re +import Build, Configure, Utils from Configure import conf from samba_utils import * + +def add_option(self, *k, **kw): + '''syntax help: provide the "match" attribute to opt.add_option() so that folders can be added to specific config tests''' + match = kw.get('match', []) + if match: + del kw['match'] + opt = self.parser.add_option(*k, **kw) + opt.match = match + return opt +Options.Handler.add_option = add_option + +@conf +def check(self, *k, **kw): + '''Override the waf defaults to inject --with-directory options''' + + if not 'env' in kw: + kw['env'] = self.env.copy() + + # match the configuration test with speficic options, for example: + # --with-libiconv -> Options.options.iconv_open -> "Checking for library iconv" + additional_dirs = [] + if 'msg' in kw: + msg = kw['msg'] + for x in Options.Handler.parser.parser.option_list: + if getattr(x, 'match', None) and msg in x.match: + d = getattr(Options.options, x.dest, '') + if d: + additional_dirs.append(d) + + # we add the additional dirs twice: once for the test data, and again if the compilation test suceeds below + def add_options_dir(dirs, env): + for x in dirs: + if not x in env.CPPPATH: + env.CPPPATH = [os.path.join(x, 'include')] + env.CPPPATH + if not x in env.LIBPATH: + env.LIBPATH = [os.path.join(x, 'lib')] + env.LIBPATH + + add_options_dir(additional_dirs, kw['env']) + + self.validate_c(kw) + self.check_message_1(kw['msg']) + ret = None + try: + ret = self.run_c_code(*k, **kw) + except Configure.ConfigurationError, e: + self.check_message_2(kw['errmsg'], 'YELLOW') + if 'mandatory' in kw and kw['mandatory']: + if Logs.verbose > 1: + raise + else: + self.fatal('the configuration failed (see %r)' % self.log.name) + else: + kw['success'] = ret + self.check_message_2(self.ret_msg(kw['okmsg'], kw)) + + # success! keep the CPPPATH/LIBPATH + add_options_dir(additional_dirs, self.env) + + self.post_check(*k, **kw) + if not kw.get('execute', False): + return ret == 0 + return ret + + @conf def CHECK_ICONV(conf, define='HAVE_NATIVE_ICONV'): '''check if the iconv library is installed diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript index 4db3412..7bf6a13 100755 --- a/buildtools/wafsamba/wscript +++ b/buildtools/wafsamba/wscript @@ -77,6 +77,11 @@ def set_options(opt): help=("private library directory [PREFIX/lib/%s]" % Utils.g_module.APPNAME), action="store", dest='PRIVATELIBDIR', default=None) + opt.add_option('--with-libiconv', + help='additional directory to search for for libiconv', + action='store', dest='iconv_open', default='/usr/local', + match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h']) + gr = opt.option_group('developer options') gr.add_option('-C', diff --git a/examples/VFS/Makefile.in b/examples/VFS/Makefile.in index fab5611..db787de 100644 --- a/examples/VFS/Makefile.in +++ b/examples/VFS/Makefile.in @@ -10,6 +10,7 @@ OBJEXT = @OBJEXT@ FLAGS = $(CFLAGS) $(CPPFLAGS) -fPIC \ -Iinclude -I$(SAMBA_SOURCE)/include \ -I$(SAMBA_SOURCE)/include/autoconf \ + -I$(SAMBA_SOURCE)/autoconf \ -I$(SAMBA_SOURCE)/../popt \ -I$(SAMBA_SOURCE)/../lib/replace \ -I$(SAMBA_SOURCE)/../lib/talloc \ diff --git a/script/autobuild.py b/script/autobuild.py index 41b2537..e98408d 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -55,23 +55,23 @@ tasks = { ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"), ("clean", "make clean", "text/plain") ], - "samba4-libs" : [ ("talloc-configure", "cd lib/talloc && PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=NONE --enable-debug -C ${PREFIX}", "text/plain"), + "samba4-libs" : [ ("talloc-configure", "cd lib/talloc && PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=NONE --abi-check --enable-debug -C ${PREFIX}", "text/plain"), ("talloc-make", "cd lib/talloc && make -j", "text/plain"), ("talloc-install", "cd lib/talloc && make install", "text/plain"), - ("tdb-configure", "cd lib/tdb && PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=NONE --enable-debug -C ${PREFIX}", "text/plain"), + ("tdb-configure", "cd lib/tdb && PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=NONE --abi-check --enable-debug -C ${PREFIX}", "text/plain"), ("tdb-make", "cd lib/tdb && make -j", "text/plain"), ("tdb-install", "cd lib/tdb && make install", "text/plain"), - ("tevent-configure", "cd lib/tevent && PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=NONE --enable-debug -C ${PREFIX}", "text/plain"), + ("tevent-configure", "cd lib/tevent && PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=NONE --abi-check --enable-debug -C ${PREFIX}", "text/plain"), ("tevent-make", "cd lib/tevent && make -j", "text/plain"), ("tevent-install", "cd lib/tevent && make install", "text/plain"), - ("ldb-configure", "cd lib/ldb && PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=NONE --disable-tdb2 --enable-debug -C ${PREFIX}", "text/plain"), + ("ldb-configure", "cd lib/ldb && PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=NONE --disable-tdb2 --abi-check --enable-debug -C ${PREFIX}", "text/plain"), ("ldb-make", "cd lib/ldb && make -j", "text/plain"), ("ldb-install", "cd lib/ldb && make install", "text/plain"), - ("configure", "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=!talloc,!tdb,!pytdb,!ldb,!pyldb,!tevent,!pytevent --disable-tdb2 --enable-debug -C ${PREFIX}", "text/plain"), + ("configure", "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=!talloc,!tdb,!pytdb,!ldb,!pyldb,!tevent,!pytevent --disable-tdb2 --abi-check --enable-debug -C ${PREFIX}", "text/plain"), ("make", "make -j", "text/plain"), ("install", "make install", "text/plain")], diff --git a/source3/Makefile.in b/source3/Makefile.in index a401543..984cc00 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -172,6 +172,8 @@ FLAGS = -I. \ $(ISA) \ -I$(srcdir)/lib \ -I.. \ + -Iautoconf \ + -Iautoconf/librpc \ -I./../lib/ldb/include \ -D_SAMBA_BUILD_=3 @@ -287,9 +289,9 @@ PASSCHANGE_OBJ = libsmb/passchange.o LIBNDR_DRSUAPI_OBJ = ../librpc/ndr/ndr_drsuapi.o \ ../librpc/ndr/ndr_compression.o \ - librpc/gen_ndr/ndr_drsuapi.o \ + autoconf/librpc/gen_ndr/ndr_drsuapi.o \ ../librpc/ndr/ndr_drsblobs.o \ - librpc/gen_ndr/ndr_drsblobs.o + autoconf/librpc/gen_ndr/ndr_drsblobs.o ZLIB_OBJ = @ZLIB_OBJS@ @@ -299,101 +301,101 @@ COMPRESSION_OBJ = ../lib/compression/lzxpress.o \ DRSUAPI_OBJ = $(LIBNDR_DRSUAPI_OBJ) \ $(COMPRESSION_OBJ) -LIBNDR_NTLMSSP_OBJ = librpc/gen_ndr/ndr_ntlmssp.o \ +LIBNDR_NTLMSSP_OBJ = autoconf/librpc/gen_ndr/ndr_ntlmssp.o \ ../librpc/ndr/ndr_ntlmssp.o LIBNDR_OBJ = ../librpc/ndr/ndr_basic.o \ ../librpc/ndr/ndr.o \ ../librpc/ndr/ndr_misc.o \ - librpc/gen_ndr/ndr_misc.o \ - librpc/gen_ndr/ndr_security.o \ + autoconf/librpc/gen_ndr/ndr_misc.o \ + autoconf/librpc/gen_ndr/ndr_security.o \ ../librpc/ndr/ndr_sec_helper.o \ ../librpc/ndr/ndr_string.o \ ../librpc/ndr/uuid.o \ ../librpc/ndr/util.o \ - librpc/gen_ndr/ndr_server_id.o \ - librpc/gen_ndr/ndr_file_id.o \ - librpc/gen_ndr/ndr_dcerpc.o + autoconf/librpc/gen_ndr/ndr_server_id.o \ + autoconf/librpc/gen_ndr/ndr_file_id.o \ + autoconf/librpc/gen_ndr/ndr_dcerpc.o -LIBNDR_GEN_OBJ0 = librpc/gen_ndr/ndr_samr.o \ - librpc/gen_ndr/ndr_lsa.o +LIBNDR_GEN_OBJ0 = autoconf/librpc/gen_ndr/ndr_samr.o \ + autoconf/librpc/gen_ndr/ndr_lsa.o -LIBNDR_NETLOGON_OBJ = librpc/gen_ndr/ndr_netlogon.o \ +LIBNDR_NETLOGON_OBJ = autoconf/librpc/gen_ndr/ndr_netlogon.o \ ../librpc/ndr/ndr_netlogon.o -LIBNDR_SCHANNEL_OBJ = librpc/gen_ndr/ndr_schannel.o \ +LIBNDR_SCHANNEL_OBJ = autoconf/librpc/gen_ndr/ndr_schannel.o \ ../librpc/ndr/ndr_schannel.o -LIBNDR_SPOOLSS_OBJ = librpc/gen_ndr/ndr_spoolss.o \ +LIBNDR_SPOOLSS_OBJ = autoconf/librpc/gen_ndr/ndr_spoolss.o \ ../librpc/ndr/ndr_spoolss_buf.o -LIBNDR_NTPRINTING_OBJ = librpc/gen_ndr/ndr_ntprinting.o \ +LIBNDR_NTPRINTING_OBJ = autoconf/librpc/gen_ndr/ndr_ntprinting.o \ ../librpc/ndr/ndr_ntprinting.o \ -LIBNDR_PREG_OBJ = librpc/gen_ndr/ndr_preg.o \ +LIBNDR_PREG_OBJ = autoconf/librpc/gen_ndr/ndr_preg.o \ ../librpc/ndr/ndr_preg.o -LIBNDR_XATTR_OBJ = librpc/gen_ndr/ndr_xattr.o \ +LIBNDR_XATTR_OBJ = autoconf/librpc/gen_ndr/ndr_xattr.o \ ../librpc/ndr/ndr_xattr.o -LIBCLI_SPOOLSS_OBJ = librpc/gen_ndr/ndr_spoolss_c.o \ +LIBCLI_SPOOLSS_OBJ = autoconf/librpc/gen_ndr/ndr_spoolss_c.o \ rpc_client/cli_spoolss.o \ rpc_client/init_spoolss.o \ rpc_client/cli_winreg_spoolss.o \ printing/nt_printing_os2.o -LIBCLI_EVENTLOG_OBJ = librpc/gen_ndr/ndr_eventlog_c.o +LIBCLI_EVENTLOG_OBJ = autoconf/librpc/gen_ndr/ndr_eventlog_c.o -LIBCLI_WINREG_OBJ = librpc/gen_ndr/ndr_winreg_c.o \ +LIBCLI_WINREG_OBJ = autoconf/librpc/gen_ndr/ndr_winreg_c.o \ rpc_client/cli_winreg.o LIBCLI_WINREG_INT_OBJ = $(LIBCLI_WINREG_OBJ) \ rpc_client/cli_winreg_int.o -LIBCLI_NTSVCS_OBJ = librpc/gen_ndr/ndr_ntsvcs_c.o +LIBCLI_NTSVCS_OBJ = autoconf/librpc/gen_ndr/ndr_ntsvcs_c.o -LIBCLI_DRSUAPI_OBJ = librpc/gen_ndr/ndr_drsuapi_c.o +LIBCLI_DRSUAPI_OBJ = autoconf/librpc/gen_ndr/ndr_drsuapi_c.o -LIBCLI_DFS_OBJ = librpc/gen_ndr/ndr_dfs_c.o +LIBCLI_DFS_OBJ = autoconf/librpc/gen_ndr/ndr_dfs_c.o -LIBCLI_ECHO_OBJ = librpc/gen_ndr/ndr_echo_c.o +LIBCLI_ECHO_OBJ = autoconf/librpc/gen_ndr/ndr_echo_c.o -LIBCLI_INITSHUTDOWN_OBJ = librpc/gen_ndr/ndr_initshutdown_c.o +LIBCLI_INITSHUTDOWN_OBJ = autoconf/librpc/gen_ndr/ndr_initshutdown_c.o -LIBCLI_DSSETUP_OBJ = librpc/gen_ndr/ndr_dssetup_c.o +LIBCLI_DSSETUP_OBJ = autoconf/librpc/gen_ndr/ndr_dssetup_c.o -LIBCLI_SVCCTL_OBJ = librpc/gen_ndr/ndr_svcctl_c.o +LIBCLI_SVCCTL_OBJ = autoconf/librpc/gen_ndr/ndr_svcctl_c.o -LIBCLI_WKSSVC_OBJ = librpc/gen_ndr/ndr_wkssvc_c.o +LIBCLI_WKSSVC_OBJ = autoconf/librpc/gen_ndr/ndr_wkssvc_c.o -LIBCLI_SRVSVC_OBJ = librpc/gen_ndr/ndr_srvsvc_c.o +LIBCLI_SRVSVC_OBJ = autoconf/librpc/gen_ndr/ndr_srvsvc_c.o -LIBCLI_LSA_OBJ = librpc/gen_ndr/ndr_lsa_c.o \ +LIBCLI_LSA_OBJ = autoconf/librpc/gen_ndr/ndr_lsa_c.o \ rpc_client/cli_lsarpc.o \ rpc_client/init_lsa.o -LIBCLI_SAMR_OBJ = librpc/gen_ndr/ndr_samr_c.o \ +LIBCLI_SAMR_OBJ = autoconf/librpc/gen_ndr/ndr_samr_c.o \ rpc_client/cli_samr.o -LIBCLI_NETLOGON_OBJ = librpc/gen_ndr/ndr_netlogon_c.o \ +LIBCLI_NETLOGON_OBJ = autoconf/librpc/gen_ndr/ndr_netlogon_c.o \ rpc_client/cli_netlogon.o \ rpc_client/util_netlogon.o -LIBCLI_EPMAPPER_OBJ = librpc/gen_ndr/ndr_epmapper_c.o +LIBCLI_EPMAPPER_OBJ = autoconf/librpc/gen_ndr/ndr_epmapper_c.o -LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \ +LIBNDR_GEN_OBJ = autoconf/librpc/gen_ndr/ndr_wkssvc.o \ $(LIBNDR_GEN_OBJ0) \ - librpc/gen_ndr/ndr_dfs.o \ - librpc/gen_ndr/ndr_dfsblobs.o \ - librpc/gen_ndr/ndr_echo.o \ - librpc/gen_ndr/ndr_winreg.o \ - librpc/gen_ndr/ndr_initshutdown.o \ - librpc/gen_ndr/ndr_srvsvc.o \ - librpc/gen_ndr/ndr_eventlog.o \ + autoconf/librpc/gen_ndr/ndr_dfs.o \ + autoconf/librpc/gen_ndr/ndr_dfsblobs.o \ + autoconf/librpc/gen_ndr/ndr_echo.o \ + autoconf/librpc/gen_ndr/ndr_winreg.o \ + autoconf/librpc/gen_ndr/ndr_initshutdown.o \ + autoconf/librpc/gen_ndr/ndr_srvsvc.o \ + autoconf/librpc/gen_ndr/ndr_eventlog.o \ $(LIBNDR_NETLOGON_OBJ) \ - librpc/gen_ndr/ndr_dssetup.o \ - librpc/gen_ndr/ndr_epmapper.o \ - librpc/gen_ndr/ndr_ntsvcs.o \ + autoconf/librpc/gen_ndr/ndr_dssetup.o \ + autoconf/librpc/gen_ndr/ndr_epmapper.o \ + autoconf/librpc/gen_ndr/ndr_ntsvcs.o \ $(LIBNDR_SPOOLSS_OBJ) # this includes only the low level parse code, not stuff @@ -434,7 +436,7 @@ CRYPTO_OBJ = ../lib/crypto/crc32.o @CRYPTO_MD5_OBJ@ \ ../lib/crypto/aes_cmac_128.o LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \ - lib/messages.o librpc/gen_ndr/ndr_messaging.o lib/messages_local.o \ + lib/messages.o autoconf/librpc/gen_ndr/ndr_messaging.o lib/messages_local.o \ lib/messages_ctdbd.o lib/ctdb_packet.o lib/ctdbd_conn.o \ lib/ctdb_conn.o \ lib/msg_channel.o \ @@ -525,19 +527,19 @@ LIBADS_OBJ = libads/ldap.o \ LIBADS_SERVER_OBJ = libads/authdata.o ../auth/kerberos/kerberos_pac.o \ ../librpc/ndr/ndr_krb5pac.o \ - librpc/gen_ndr/ndr_krb5pac.o + autoconf/librpc/gen_ndr/ndr_krb5pac.o LIBADS_PRINTER_OBJ = libads/ldap_printer.o SECRETS_OBJ = passdb/secrets.o passdb/machine_account_secrets.o passdb/machine_sid.o \ - librpc/gen_ndr/ndr_secrets.o \ + autoconf/librpc/gen_ndr/ndr_secrets.o \ passdb/secrets_lsa.o LIBNBT_OBJ = ../libcli/nbt/nbtname.o \ ../libcli/netlogon/netlogon.o \ - librpc/gen_ndr/ndr_nbt.o \ + autoconf/librpc/gen_ndr/ndr_nbt.o \ ../librpc/ndr/ndr_nbt.o \ - librpc/gen_ndr/ndr_svcctl.o \ + autoconf/librpc/gen_ndr/ndr_svcctl.o \ ../librpc/ndr/ndr_svcctl.o LIBNMB_OBJ = libsmb/unexpected.o libsmb/namecache.o libsmb/nmblib.o \ @@ -705,62 +707,62 @@ REG_FULL_OBJ = $(REG_SMBCONF_OBJ) \ $(REG_BACKENDS_EXTRA_OBJ) \ $(REG_INIT_FULL_OBJ) \ registry/reg_perfcount.o \ - librpc/gen_ndr/ndr_perfcount.o + autoconf/librpc/gen_ndr/ndr_perfcount.o LIB_EVENTLOG_OBJ = lib/eventlog/eventlog.o DCE_RPC_EP_OBJ = librpc/rpc/dcerpc_ep.o RPC_LSARPC_OBJ = rpc_server/lsa/srv_lsa_nt.o \ - librpc/gen_ndr/srv_lsa.o \ + autoconf/librpc/gen_ndr/srv_lsa.o \ ../libcli/lsarpc/util_lsarpc.o RPC_NETLOGON_OBJ = rpc_server/netlogon/srv_netlog_nt.o \ - librpc/gen_ndr/srv_netlogon.o + autoconf/librpc/gen_ndr/srv_netlogon.o RPC_SAMR_OBJ = rpc_server/samr/srv_samr_nt.o \ rpc_server/samr/srv_samr_util.o \ rpc_server/samr/srv_samr_chgpasswd.o \ - librpc/gen_ndr/srv_samr.o + autoconf/librpc/gen_ndr/srv_samr.o -RPC_INITSHUTDOWN_OBJ = librpc/gen_ndr/srv_initshutdown.o rpc_server/initshutdown/srv_initshutdown_nt.o +RPC_INITSHUTDOWN_OBJ = autoconf/librpc/gen_ndr/srv_initshutdown.o rpc_server/initshutdown/srv_initshutdown_nt.o RPC_WINREG_OBJ = rpc_server/winreg/srv_winreg_nt.o \ - librpc/gen_ndr/srv_winreg.o + autoconf/librpc/gen_ndr/srv_winreg.o -RPC_DSSETUP_OBJ = rpc_server/dssetup/srv_dssetup_nt.o librpc/gen_ndr/srv_dssetup.o +RPC_DSSETUP_OBJ = rpc_server/dssetup/srv_dssetup_nt.o autoconf/librpc/gen_ndr/srv_dssetup.o RPC_SRVSVC_OBJ = rpc_server/srvsvc/srv_srvsvc_nt.o \ - librpc/gen_ndr/srv_srvsvc.o + autoconf/librpc/gen_ndr/srv_srvsvc.o -RPC_WKSSVC_OBJ = librpc/gen_ndr/srv_wkssvc.o \ +RPC_WKSSVC_OBJ = autoconf/librpc/gen_ndr/srv_wkssvc.o \ rpc_server/wkssvc/srv_wkssvc_nt.o RPC_SVCCTL_OBJ = rpc_server/svcctl/srv_svcctl_nt.o \ rpc_server/svcctl/srv_svcctl_reg.o \ - librpc/gen_ndr/srv_svcctl.o \ + autoconf/librpc/gen_ndr/srv_svcctl.o \ services/svc_winreg_glue.o \ services/svc_spoolss.o services/svc_rcinit.o \ services/svc_netlogon.o services/svc_winreg.o \ services/svc_wins.o RPC_NTSVCS_OBJ = rpc_server/ntsvcs/srv_ntsvcs_nt.o \ - librpc/gen_ndr/srv_ntsvcs.o + autoconf/librpc/gen_ndr/srv_ntsvcs.o -RPC_NETDFS_OBJ = librpc/gen_ndr/srv_dfs.o \ +RPC_NETDFS_OBJ = autoconf/librpc/gen_ndr/srv_dfs.o \ rpc_server/dfs/srv_dfs_nt.o RPC_SPOOLSS_OBJ = rpc_server/spoolss/srv_spoolss_nt.o \ rpc_server/spoolss/srv_spoolss_util.o \ - librpc/gen_ndr/srv_spoolss.o + autoconf/librpc/gen_ndr/srv_spoolss.o RPC_EVENTLOG_OBJ = rpc_server/eventlog/srv_eventlog_nt.o \ rpc_server/eventlog/srv_eventlog_reg.o \ - $(LIB_EVENTLOG_OBJ) librpc/gen_ndr/srv_eventlog.o + $(LIB_EVENTLOG_OBJ) autoconf/librpc/gen_ndr/srv_eventlog.o NPA_TSTREAM_OBJ = ../libcli/named_pipe_auth/npa_tstream.o \ - librpc/gen_ndr/ndr_named_pipe_auth.o \ - ../auth/auth_sam_reply.o librpc/gen_ndr/ndr_auth.o ../librpc/ndr/ndr_auth.o + autoconf/librpc/gen_ndr/ndr_named_pipe_auth.o \ + ../auth/auth_sam_reply.o autoconf/librpc/gen_ndr/ndr_auth.o ../librpc/ndr/ndr_auth.o RPC_NCACN_NP = rpc_server/srv_pipe_register.o rpc_server/rpc_ncacn_np.o \ rpc_server/rpc_handles.o rpc_server/rpc_contexts.o \ @@ -775,9 +777,9 @@ RPC_CRYPTO = rpc_server/dcesrv_auth_generic.o RPC_PIPE_OBJ = rpc_server/srv_pipe.o rpc_server/srv_pipe_hnd.o \ $(RPC_CONFIG) $(RPC_NCACN_NP) $(RPC_SERVICE) $(RPC_CRYPTO) -RPC_RPCECHO_OBJ = rpc_server/echo/srv_echo_nt.o librpc/gen_ndr/srv_echo.o +RPC_RPCECHO_OBJ = rpc_server/echo/srv_echo_nt.o autoconf/librpc/gen_ndr/srv_echo.o -RPC_EPMAPPER_OBJ = rpc_server/epmapper/srv_epmapper.o librpc/gen_ndr/srv_epmapper.o +RPC_EPMAPPER_OBJ = rpc_server/epmapper/srv_epmapper.o autoconf/librpc/gen_ndr/srv_epmapper.o RPC_SERVER_REGISTER_OBJ = rpc_server/rpc_ep_register.o $(DCE_RPC_EP_OBJ) @@ -803,7 +805,7 @@ RPC_SERVER_OBJ = $(RPC_LSARPC_OBJ) $(RPC_WINREG_OBJ) $(RPC_INITSHUTDOWN_OBJ) \ RPC_CLIENT_SCHANNEL_OBJ = rpc_client/cli_pipe_schannel.o LOCKING_OBJ = locking/locking.o locking/brlock.o locking/posix.o \ - librpc/gen_ndr/ndr_open_files.o locking/share_mode_lock.o + autoconf/librpc/gen_ndr/ndr_open_files.o locking/share_mode_lock.o PRIVILEGES_BASIC_OBJ = ../libcli/security/privileges.o @@ -836,7 +838,7 @@ PROFILES_OBJ = utils/profiles.o \ OPLOCK_OBJ = smbd/oplock.o smbd/oplock_irix.o smbd/oplock_linux.o NOTIFY_OBJ = smbd/notify.o smbd/notify_inotify.o smbd/notify_internal.o \ - librpc/gen_ndr/ndr_notify.o + autoconf/librpc/gen_ndr/ndr_notify.o FNAME_UTIL_OBJ = lib/filename_util.o @@ -987,7 +989,7 @@ PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/print_aix.o \ printing/print_cups.o printing/print_generic.o \ printing/lpq_parse.o printing/load.o \ printing/print_iprint.o printing/print_standard.o \ - printing/printer_list.o librpc/gen_ndr/ndr_printcap.o + printing/printer_list.o autoconf/librpc/gen_ndr/ndr_printcap.o PRINTBASE_OBJ = printing/notify.o printing/printing_db.o PRINTBACKEND_OBJ = printing/printing.o \ @@ -996,7 +998,7 @@ PRINTBACKEND_OBJ = printing/printing.o \ printing/nt_printing_migrate.o \ printing/nt_printing_migrate_internal.o \ printing/nt_printing_ads.o \ - librpc/gen_ndr/ndr_ntprinting.o \ + autoconf/librpc/gen_ndr/ndr_ntprinting.o \ ../librpc/ndr/ndr_ntprinting.o \ printing/queue_process.o \ $(PRINTBASE_OBJ) @@ -1033,7 +1035,7 @@ SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(PRINTING_OBJ) $(PRINTBASE_OBJ) $(LIBSMB_O STATUS_OBJ = utils/status.o utils/status_profile.o \ $(LOCKING_OBJ) $(PARAM_OBJ) \ - smbd/notify_internal.o librpc/gen_ndr/ndr_notify.o \ + smbd/notify_internal.o autoconf/librpc/gen_ndr/ndr_notify.o \ $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \ $(LIBSMB_ERR_OBJ) $(FNAME_UTIL_OBJ) @@ -1177,7 +1179,7 @@ PTHREADPOOLTEST_OBJ = lib/pthreadpool/pthreadpool.o \ -- Samba Shared Repository