The branch, master has been updated via 5d54dc2 s3-waf: fix libnetapi and libaddns unresolved symbols. via 96e982c s3-waf: install header files for our libraries. via 4e6d7fa s3-waf: convert LIBEVENTLOG into a subsystem. via bd5f932 s4-waf: add NDR_EVENTLOG. via 204ba65 s4-waf: rename subsystem NDR_LSAPRC to NDR_LSA. from db4bec3 s3-waf: convert LIBNET et al into subsystems.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 5d54dc2f9716db434b0b184d39df25db68ea256c Author: Günther Deschner <g...@samba.org> Date: Fri Sep 24 21:52:07 2010 -0700 s3-waf: fix libnetapi and libaddns unresolved symbols. Guenther commit 96e982c2ba41e5aade96382ae152b6d76800e112 Author: Günther Deschner <g...@samba.org> Date: Fri Sep 24 21:46:39 2010 -0700 s3-waf: install header files for our libraries. Guenther commit 4e6d7fa527e860fb2420b1b1dddbec167fb8f533 Author: Günther Deschner <g...@samba.org> Date: Fri Sep 24 17:06:16 2010 -0700 s3-waf: convert LIBEVENTLOG into a subsystem. Guenther commit bd5f932eef1b44f9d553a3faff941e7bfaca3bf5 Author: Günther Deschner <g...@samba.org> Date: Fri Sep 24 17:05:44 2010 -0700 s4-waf: add NDR_EVENTLOG. Guenther commit 204ba6577272530edb34ada9389b491c5fd60361 Author: Günther Deschner <g...@samba.org> Date: Fri Sep 24 17:18:03 2010 -0700 s4-waf: rename subsystem NDR_LSAPRC to NDR_LSA. Guenther ----------------------------------------------------------------------- Summary of changes: librpc/wscript_build | 9 +++++- source3/wscript_build | 52 +++++++++++++++++++++++------------------ source4/librpc/wscript_build | 4 +- 3 files changed, 38 insertions(+), 27 deletions(-) Changeset truncated at 500 lines: diff --git a/librpc/wscript_build b/librpc/wscript_build index a9ce148..f297d56 100644 --- a/librpc/wscript_build +++ b/librpc/wscript_build @@ -184,14 +184,19 @@ bld.SAMBA_SUBSYSTEM('NDR_NTPRINTING', bld.SAMBA_SUBSYSTEM('NDR_SAMR', source='../librpc/gen_ndr/ndr_samr.c', - public_deps='LIBNDR NDR_SECURITY NDR_LSARPC' + public_deps='LIBNDR NDR_SECURITY NDR_LSA' ) -bld.SAMBA_SUBSYSTEM('NDR_LSARPC', +bld.SAMBA_SUBSYSTEM('NDR_LSA', source='../librpc/gen_ndr/ndr_lsa.c', public_deps='LIBNDR NDR_SECURITY' ) +bld.SAMBA_SUBSYSTEM('NDR_EVENTLOG', + source='../librpc/gen_ndr/ndr_eventlog.c', + public_deps='LIBNDR NDR_SECURITY NDR_LSA' + ) + bld.SAMBA_SUBSYSTEM('NDR_COMPRESSION', source='../librpc/ndr/ndr_compression.c', public_deps='LIBSAMBA-ERRORS LIBNDR', diff --git a/source3/wscript_build b/source3/wscript_build index badea91..c8c3b80 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -51,8 +51,7 @@ LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c ../librpc/ndr/uuid.c librpc/ndr/util.c''' -LIBNDR_GEN_SRC0 = '''../librpc/gen_ndr/ndr_samr.c - ../librpc/gen_ndr/ndr_lsa.c''' +LIBNDR_GEN_SRC0 = '''../librpc/gen_ndr/ndr_samr.c''' LIBNDR_NETLOGON_SRC = '''../librpc/gen_ndr/ndr_netlogon.c ../librpc/ndr/ndr_netlogon.c''' @@ -149,7 +148,6 @@ LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c ../librpc/gen_ndr/ndr_winreg.c ../librpc/gen_ndr/ndr_initshutdown.c ../librpc/gen_ndr/ndr_srvsvc.c - ../librpc/gen_ndr/ndr_eventlog.c ${LIBNDR_NETLOGON_SRC} ../librpc/gen_ndr/ndr_dssetup.c ../librpc/gen_ndr/ndr_epmapper.c @@ -455,7 +453,7 @@ RPC_SPOOLSS_SRC = '''rpc_server/srv_spoolss_nt.c ../librpc/gen_ndr/srv_spoolss.c''' RPC_EVENTLOG_SRC = '''rpc_server/srv_eventlog_nt.c - ${LIB_EVENTLOG_SRC} ../librpc/gen_ndr/srv_eventlog.c''' + ../librpc/gen_ndr/srv_eventlog.c''' NPA_TSTREAM_SRC = '''../libcli/named_pipe_auth/npa_tstream.c ../librpc/gen_ndr/ndr_named_pipe_auth.c''' @@ -1028,7 +1026,7 @@ NET_SRC = '''${NET_SRC1} ${NET_SRC2} ${DCUTIL_SRC} ${LIBGPO_SRC} ${DISPLAY_SEC_SRC} - ${LIB_EVENTLOG_SRC} ${REGFIO_SRC}''' + ${REGFIO_SRC}''' CUPS_SRC = '''client/smbspool.c''' @@ -1070,9 +1068,7 @@ SMBCQUOTAS_SRC = '''utils/smbcquotas.c EVTLOGADM_SRC0 = 'utils/eventlogadm.c' EVTLOGADM_SRC = '''${EVTLOGADM_SRC0} - registry/reg_eventlog.c ${LIB_EVENTLOG_SRC} - ../librpc/gen_ndr/ndr_eventlog.c - ../librpc/gen_ndr/ndr_lsa.c''' + registry/reg_eventlog.c''' SHARESEC_SRC0 = 'utils/sharesec.c' SHARESEC_SRC = '''${SHARESEC_SRC0}''' @@ -1179,29 +1175,34 @@ bld.SAMBA_LIBRARY('libwbclient', ../nsswitch/libwbclient/wbc_pwd.c ../nsswitch/libwbclient/wbc_sid.c ../nsswitch/libwbclient/wbc_util.c''', + public_headers='../nsswitch/libwbclient/wbclient.h', public_deps='talloc WBCOMMON') bld.SAMBA_LIBRARY('libnetapi', source=LIBNETAPI_SRC, public_deps='''talloc tdb cap libwbclient LIB_NONSMBD LIBSMB KRBCLIENT PASSDB SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG - LIBMSRPC_GEN LIBMSRPC LIBADS''', + LIBMSRPC_GEN LIBMSRPC LIBADS LIBNET''', + public_headers='lib/netapi/netapi.h', vars=locals()) bld.SAMBA_LIBRARY('libsmbclient', source=LIBSMBCLIENT_SRC, public_deps='''talloc tdb libwbclient cap PARAM LIB_NONSMBD LIBSMB KRBCLIENT PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC''', + public_headers='include/libsmbclient.h', vars=locals()) bld.SAMBA_LIBRARY('libsmbsharemodes', source=LIBSMBSHAREMODES_SRC, public_deps='''talloc tdb''', + public_headers='include/smb_share_modes.h', vars=locals()) bld.SAMBA_LIBRARY('libaddns', source=LIBADDNS_SRC, - public_deps='SOCKET_WRAPPER', + deps='SOCKET_WRAPPER', + public_deps='talloc krb5 k5crypto com_err gssapi gssapi_krb5', vars=locals()) bld.SAMBA_SUBSYSTEM('LIBMSRPC', @@ -1211,7 +1212,7 @@ bld.SAMBA_SUBSYSTEM('LIBMSRPC', bld.SAMBA_SUBSYSTEM('LIBMSRPC_GEN', source='${LIBNDR_GEN_SRC}', - deps='LIBNDR NDR_SECURITY NDR_DCERPC', + deps='LIBNDR NDR_SECURITY NDR_DCERPC NDR_EVENTLOG NDR_LSA', vars=locals()) bld.SAMBA_SUBSYSTEM('ASN1_UTIL', @@ -1321,7 +1322,7 @@ bld.SAMBA_SUBSYSTEM('SMBD_BASE', NSS_WRAPPER DYNCONFIG libwbclient crypt nsl cups cap resolv ZLIB PASSDB PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER - VFS_DEFAULT RPC_MODULES AUTH LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE LIBNET''', + VFS_DEFAULT RPC_MODULES AUTH LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE LIBNET LIBEVENTLOG''', vars=locals()) bld.SAMBA_SUBSYSTEM('RPC_MODULES', @@ -1363,6 +1364,11 @@ bld.SAMBA_SUBSYSTEM('LIBNET_SAMSYNC', deps='LIBNET', vars=locals()) +bld.SAMBA_SUBSYSTEM('LIBEVENTLOG', + source=LIB_EVENTLOG_SRC, + deps='NDR_EVENTLOG', + vars=locals()) + bld.SAMBA_SUBSYSTEM('LIBNDR', source=LIBNDR_SRC, vars=locals()) @@ -1416,7 +1422,7 @@ bld.SAMBA_BINARY('nmbd/nmbd', source=NMBD_SRC, deps='''talloc tdb tevent ZLIB cap resolv libwbclient dl NSS_WRAPPER PASSDB PARAM ldap LIB_NONSMBD LIBSMB - POPT_SAMBA KRBCLIENT NDR_SAMR NDR_LSARPC''', + POPT_SAMBA KRBCLIENT NDR_SAMR NDR_LSA''', install_path='${SBINDIR}', vars=locals()) @@ -1460,7 +1466,7 @@ bld.SAMBA_BINARY('net', deps='''talloc tdb libnetapi libaddns cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER LOCALE_DIR LIBAFS LIBAFS_SETTOKEN READLINE PASSWD_UTIL LIBNET - LIBNET_DSSYNC LIBNET_SAMSYNC''', + LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG''', vars=locals()) bld.SAMBA_BINARY('profiles', @@ -1471,7 +1477,7 @@ bld.SAMBA_BINARY('profiles', bld.SAMBA_BINARY('smbspool', source=CUPS_SRC, deps='''talloc tdb tevent resolv cap libwbclient POPT_SAMBA PARAM LIBSMB LIB_NONSMBD LIBS - KRBCLIENT ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC''', + KRBCLIENT ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''', vars=locals()) bld.SAMBA_BINARY('testparm', @@ -1530,7 +1536,7 @@ bld.SAMBA_BINARY('nmblookup', bld.SAMBA_BINARY('smbtorture', source=SMBTORTURE_SRC, deps='''talloc tdb tevent cap resolv libwbclient PARAM LIBSMB KRBCLIENT - LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC''', + LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''', vars=locals()) bld.SAMBA_BINARY('smbconftort', @@ -1541,7 +1547,7 @@ bld.SAMBA_BINARY('smbconftort', bld.SAMBA_BINARY('masktest', source=MASKTEST_SRC, deps='''talloc tdb cap resolv libwbclient PARAM LIB_NONSMBD LIBSMB KRBCLIENT - ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC''', + ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''', vars=locals()) bld.SAMBA_BINARY('msgtest', @@ -1565,7 +1571,7 @@ bld.SAMBA_BINARY('smbcquotas', bld.SAMBA_BINARY('eventlogadm', source=EVTLOGADM_SRC, deps='''talloc tevent cap POPT_SAMBA LIBS PARAM - LIB_NONSMBD LIBSMB_ERR PASSDB libwbclient''', + LIB_NONSMBD LIBSMB_ERR PASSDB libwbclient LIBEVENTLOG''', vars=locals()) bld.SAMBA_BINARY('sharesec', @@ -1576,7 +1582,7 @@ bld.SAMBA_BINARY('sharesec', bld.SAMBA_BINARY('locktest', source=LOCKTEST_SRC, deps='''talloc tdb tevent cap resolv libwbclient PARAM KRBCLIENT LIBSMB LIB_NONSMBD - ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC LOCKING''', + ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING''', vars=locals()) bld.SAMBA_BINARY('nsstest', @@ -1587,7 +1593,7 @@ bld.SAMBA_BINARY('nsstest', bld.SAMBA_BINARY('pdbtest', source=PDBTEST_SRC, deps='''talloc tdb cap resolv libwbclient PARAM LIBSMB KRBCLIENT LIB_NONSMBD PASSDB GROUPDB - SMBLDAP POPT_SAMBA NDR_SAMR NDR_LSARPC''', + SMBLDAP POPT_SAMBA NDR_SAMR NDR_LSA''', vars=locals()) bld.SAMBA_BINARY('vfstest', @@ -1608,7 +1614,7 @@ bld.SAMBA_BINARY('log2pcap', bld.SAMBA_BINARY('locktest2', source=LOCKTEST2_SRC, deps='''talloc tdb tevent cap resolv libwbclient PARAM KRBCLIENT LIBSMB LIB_NONSMBD - ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC LOCKING''', + ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING''', vars=locals()) bld.SAMBA_BINARY('debug2html', @@ -1619,7 +1625,7 @@ bld.SAMBA_BINARY('debug2html', bld.SAMBA_BINARY('smbfilter', source=SMBFILTER_SRC, deps='''talloc tevent cap resolv libwbclient PARAM LIBSMB LIB_NONSMBD KRBCLIENT ASN1_UTIL LIBTSOCKET - NDR_SAMR NDR_LSARPC''', + NDR_SAMR NDR_LSA''', vars=locals()) bld.SAMBA_BINARY('versiontest', @@ -1638,7 +1644,7 @@ bld.SAMBA_BINARY('ntlm_auth', deps='''tdb talloc cap resolv krb5 k5crypto com_err libwbclient PARAM LIB_NONSMBD LIBS LIBSAMBA POPT_SAMBA ASN1_UTIL LIBTSOCKET PASSDB GROUPDB SMBLDAP WBCOMMON LIBINIPARSER LIBADS_SERVER - NDR_SAMR NDR_LSARPC''', + NDR_SAMR NDR_LSA''', vars=locals()) bld.SAMBA_BINARY('timelimit', diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index 967693a..edbf662 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -93,10 +93,10 @@ bld.SAMBA_SUBSYSTEM('NDR_WINBIND', bld.SAMBA_LIBRARY('NDR_STANDARD', - source='../../librpc/gen_ndr/ndr_echo.c ../../librpc/ndr/ndr_netlogon.c ../../librpc/gen_ndr/ndr_netlogon.c ../../librpc/gen_ndr/ndr_dfs.c ../../librpc/gen_ndr/ndr_atsvc.c ../../librpc/gen_ndr/ndr_wkssvc.c ../../librpc/gen_ndr/ndr_srvsvc.c ../../librpc/ndr/ndr_svcctl.c ../../librpc/gen_ndr/ndr_svcctl.c ../../librpc/gen_ndr/ndr_winreg.c ../../librpc/gen_ndr/ndr_initshutdown.c ../../librpc/gen_ndr/ndr_eventlog.c ../../librpc/gen_ndr/ndr_ntsvcs.c ../../librpc/gen_ndr/ndr_eventlog6.c', + source='../../librpc/gen_ndr/ndr_echo.c ../../librpc/ndr/ndr_netlogon.c ../../librpc/gen_ndr/ndr_netlogon.c ../../librpc/gen_ndr/ndr_dfs.c ../../librpc/gen_ndr/ndr_atsvc.c ../../librpc/gen_ndr/ndr_wkssvc.c ../../librpc/gen_ndr/ndr_srvsvc.c ../../librpc/ndr/ndr_svcctl.c ../../librpc/gen_ndr/ndr_svcctl.c ../../librpc/gen_ndr/ndr_winreg.c ../../librpc/gen_ndr/ndr_initshutdown.c ../../librpc/gen_ndr/ndr_ntsvcs.c ../../librpc/gen_ndr/ndr_eventlog6.c', vnum='0.0.1', pc_files='../../librpc/ndr_standard.pc', - deps='NDR_SECURITY NDR_LSARPC NDR_SAMR', + deps='NDR_SECURITY NDR_LSA NDR_SAMR NDR_EVENTLOG', public_deps='LIBNDR', public_headers='../../librpc/gen_ndr/samr.h ../../librpc/gen_ndr/ndr_samr.h ../../librpc/gen_ndr/lsa.h ../../librpc/gen_ndr/netlogon.h ../../librpc/gen_ndr/atsvc.h ../../librpc/gen_ndr/ndr_atsvc.h ../../librpc/gen_ndr/ndr_svcctl.h ../../librpc/gen_ndr/svcctl.h', header_path='gen_ndr' -- Samba Shared Repository