[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Fri Sep 24 13:43:28 MDT 2010
The branch, master has been updated
via e90c707 s3-waf: convert READLINE into a subsystem.
via 929b220 s3-waf: convert PROFILE into a subsystem.
via 0541e07 s3-waf: convert AFS_SETTOKEN and AFS into subsystems.
via fa3eb7f s3-waf: let winbind depend on SRV_NDR_WBINT and RPCCLI_NDR_WBINT.
via 1bec7e5 s3-waf: convert LOCKING into a subsystem.
via 2b76785 s3-waf: add RPC_NDR_WBINT to librpc/wscript_build.
via 44b0a03 s3-waf: add autogen-waf.sh to source3.
via c54881b s3-waf: add wscript_build to s3 librpc dir for NDR_ subsystems.
from c9b19d9 s4-kerberos Rework keytab handling to export servicePrincipalName entries
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e90c707f144a362a708f5d2f3eb85192dc98980a
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 24 12:42:05 2010 -0700
s3-waf: convert READLINE into a subsystem.
Guenther
commit 929b22024a4912430ccaedf12bc2962aeac90f63
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 24 12:27:57 2010 -0700
s3-waf: convert PROFILE into a subsystem.
Guenther
commit 0541e07fd93b58ef18451010a2555864e0f0d71e
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 24 12:13:27 2010 -0700
s3-waf: convert AFS_SETTOKEN and AFS into subsystems.
Guenther
commit fa3eb7f5d4cce88afc9edad81cfbc45fd959fcfd
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 24 12:04:19 2010 -0700
s3-waf: let winbind depend on SRV_NDR_WBINT and RPCCLI_NDR_WBINT.
Guenther
commit 1bec7e56a2205078823eb42ea2cca7c50ba16826
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 24 11:43:40 2010 -0700
s3-waf: convert LOCKING into a subsystem.
Guenther
commit 2b767853118abf5434f1e0feb29b5d6a4956d290
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 24 11:28:44 2010 -0700
s3-waf: add RPC_NDR_WBINT to librpc/wscript_build.
Guenther
commit 44b0a033673430990b4514b9cfdf6e5459e64e80
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 24 11:16:53 2010 -0700
s3-waf: add autogen-waf.sh to source3.
Guenther
commit c54881b2e1e102beeec2b76e64654c514d7a93d4
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 24 11:12:39 2010 -0700
s3-waf: add wscript_build to s3 librpc dir for NDR_ subsystems.
Guenther
-----------------------------------------------------------------------
Summary of changes:
{buildtools/scripts => source3}/autogen-waf.sh | 4 +-
source3/librpc/wscript_build | 46 +++++++++++++
source3/wscript_build | 82 +++++++++++++----------
3 files changed, 94 insertions(+), 38 deletions(-)
copy {buildtools/scripts => source3}/autogen-waf.sh (83%)
create mode 100644 source3/librpc/wscript_build
Changeset truncated at 500 lines:
diff --git a/buildtools/scripts/autogen-waf.sh b/source3/autogen-waf.sh
similarity index 83%
copy from buildtools/scripts/autogen-waf.sh
copy to source3/autogen-waf.sh
index 7a6e94c..432b523 100755
--- a/buildtools/scripts/autogen-waf.sh
+++ b/source3/autogen-waf.sh
@@ -22,6 +22,6 @@ sed "s|BUILDTOOLS|$d|g" < "$p/$d/scripts/Makefile.waf" > $p/Makefile
echo "done. Now run $p/configure or $p/configure.developer then make."
if [ $p != "." ]; then
- echo "Notice: The build invoke path is not 'source4'! Use make with the parameter"
- echo "-C <'source4' path>. Example: make -C source4 all"
+ echo "Notice: The build invoke path is not 'source3'! Use make with the parameter"
+ echo "-C <'source3' path>. Example: make -C source3 all"
fi
diff --git a/source3/librpc/wscript_build b/source3/librpc/wscript_build
new file mode 100644
index 0000000..269c94d
--- /dev/null
+++ b/source3/librpc/wscript_build
@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+
+bld.SAMBA_SUBSYSTEM('NDR_LIBNETAPI',
+ source='gen_ndr/ndr_libnetapi.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_MESSAGING',
+ source='gen_ndr/ndr_messaging.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_NOTIFY',
+ source='gen_ndr/ndr_notify.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_PREG',
+ source='gen_ndr/ndr_preg.c ndr/ndr_preg.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_SECRETS',
+ source='gen_ndr/ndr_secrets.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_WBINT',
+ source='gen_ndr/ndr_wbint.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_WBINT',
+ source='../librpc/gen_ndr/ndr_wbint_c.c',
+ public_deps='dcerpc NDR_WBINT'
+ )
+
+bld.SAMBA_SUBSYSTEM('RPCCLI_NDR_WBINT',
+ source='../librpc/gen_ndr/cli_wbint.c',
+ public_deps='RPC_NDR_WBINT'
+ )
+
+bld.SAMBA_SUBSYSTEM('SRV_NDR_WBINT',
+ source='../librpc/gen_ndr/srv_wbint.c',
+ public_deps='NDR_WBINT'
+ )
diff --git a/source3/wscript_build b/source3/wscript_build
index 98b609b..1affc2d 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -637,10 +637,6 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
winbindd/winbindd_dual.c
winbindd/winbindd_dual_ndr.c
winbindd/winbindd_dual_srv.c
- librpc/gen_ndr/cli_wbint.c
- librpc/gen_ndr/srv_wbint.c
- librpc/gen_ndr/ndr_wbint.c
- librpc/gen_ndr/ndr_wbint_c.c
winbindd/winbindd_async.c
winbindd/winbindd_creds.c
winbindd/winbindd_cred_cache.c
@@ -719,9 +715,8 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
../nsswitch/libwbclient/wb_reqtrans.c'''
WINBINDD_SRC = '''${WINBINDD_SRC1}
- ${PROFILE_SRC} ${SLCACHE_SRC}
+ ${SLCACHE_SRC}
${DCUTIL_SRC} ${IDMAP_SRC} ${NSS_INFO_SRC}
- ${AFS_SRC} ${AFS_SETTOKEN_SRC}
${RPC_NCACN_NP} ${NPA_TSTREAM_SRC} ${RPC_SAMR_SRC} ${RPC_LSARPC_SRC}
${TDB_VALIDATE_SRC}
${LIBCLI_DSSETUP_SRC}
@@ -753,8 +748,8 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
lib/sysquotas_xfs.c lib/sysquotas_4A.c
lib/sysquotas_nfs.c
smbd/fake_file.c
- smbd/quotas.c smbd/ntquotas.c ${AFS_SRC} smbd/msdfs.c
- ${AFS_SETTOKEN_SRC} smbd/aio.c smbd/statvfs.c
+ smbd/quotas.c smbd/ntquotas.c smbd/msdfs.c
+ smbd/aio.c smbd/statvfs.c
smbd/dmapi.c smbd/signing.c
smbd/file_access.c
smbd/dnsregister.c smbd/globals.c
@@ -782,8 +777,8 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
${RPC_SERVER_SRC}
- ${LOCKING_SRC} ${PRINTING_SRC}
- ${PROFILE_SRC} ${PRINTBACKEND_SRC}
+ ${PRINTING_SRC}
+ ${PRINTBACKEND_SRC}
${OPLOCK_SRC} ${NOTIFY_SRC} ${FNAME_UTIL_SRC}
${REG_FULL_SRC}
${BUILDOPT_SRC}
@@ -831,27 +826,23 @@ NMBD_SRC1 = '''nmbd/asyncdns.c nmbd/nmbd.c nmbd/nmbd_become_dmb.c
nmbd/nmbd_subnetdb.c nmbd/nmbd_winsproxy.c nmbd/nmbd_winsserver.c
nmbd/nmbd_workgroupdb.c nmbd/nmbd_synclists.c'''
-NMBD_SRC = '${NMBD_SRC1} ${PROFILE_SRC}'
+NMBD_SRC = '${NMBD_SRC1}'
SWAT_SRC1 = '''web/cgi.c web/diagnose.c web/startstop.c web/statuspage.c
web/swat.c web/neg_lang.c'''
SWAT_SRC = '''${SWAT_SRC1} ${PRINTING_SRC} ${PRINTBASE_SRC}
- ${LOCKING_SRC}
${PLAINTEXT_AUTH_SRC}
${PASSCHANGE_SRC} ${FNAME_UTIL_SRC}
${LIBCLI_SAMR_SRC}
rpc_client/init_lsa.c'''
STATUS_SRC = '''utils/status.c utils/status_profile.c
- ${LOCKING_SRC}
- ${PROFILE_SRC}
${FNAME_UTIL_SRC}'''
SMBCONTROL_SRC = '''utils/smbcontrol.c ${PRINTBASE_SRC}'''
SMBTREE_SRC = '''utils/smbtree.c
- ${PROFILE_SRC}
${LIBCLI_SRVSVC_SRC}'''
TESTPARM_SRC = 'utils/testparm.c'
@@ -885,7 +876,6 @@ RPCCLIENT_SRC1 = '''rpcclient/rpcclient.c rpcclient/cmd_lsarpc.c
${DISPLAY_SEC_SRC}'''
RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}
- ${READLINE_SRC}
${DCUTIL_SRC}
${LIBCLI_SPOOLSS_SRC}
${LIBCLI_EVENTLOG_SRC}
@@ -970,7 +960,7 @@ CLIENT_SRC1 = '''client/client.c client/clitar.c
client/dnsbrowse.c'''
CLIENT_SRC = '''${CLIENT_SRC1}
- ${READLINE_SRC} ${DISPLAY_SEC_SRC}
+ ${DISPLAY_SEC_SRC}
${LIBCLI_SRVSVC_SRC}
rpc_client/init_lsa.c'''
@@ -1037,7 +1027,6 @@ NET_SRC2 = 'utils/net_registry_util.c utils/net_help_common.c'
NET_SRC = '''${NET_SRC1}
${NET_SRC2}
${DCUTIL_SRC}
- ${AFS_SRC} ${AFS_SETTOKEN_SRC} ${READLINE_SRC}
${LIBGPO_SRC} ${DISPLAY_SEC_SRC}
${LIBNET_SRC} ${LIBNET_DSSYNC_SRC} ${LIBNET_SAMSYNC_SRC}
${LIB_EVENTLOG_SRC} ${REGFIO_SRC}'''
@@ -1059,21 +1048,19 @@ MASKTEST_SRC = '''torture/masktest.c'''
MSGTEST_SRC = '''torture/msgtest.c'''
-LOCKTEST_SRC = '''torture/locktest.c ${LOCKING_SRC}
- ${FNAME_UTIL_SRC}'''
+LOCKTEST_SRC = '''torture/locktest.c ${FNAME_UTIL_SRC}'''
NSSTEST_SRC = '''torture/nsstest.c ${LIBSAMBAUTIL_SRC}'''
PDBTEST_SRC = '''torture/pdbtest.c'''
-VFSTEST_SRC = '''torture/cmd_vfs.c torture/vfstest.c ${READLINE_SRC}'''
+VFSTEST_SRC = '''torture/cmd_vfs.c torture/vfstest.c'''
SMBICONV_SRC = '''torture/smbiconv.c'''
LOG2PCAP_SRC = '''utils/log2pcaphex.c'''
-LOCKTEST2_SRC = '''torture/locktest2.c ${LOCKING_SRC}
- ${FNAME_UTIL_SRC}'''
+LOCKTEST2_SRC = '''torture/locktest2.c ${FNAME_UTIL_SRC}'''
SMBCACLS_SRC = '''utils/smbcacls.c
${LIBCLI_LSA_SRC}'''
@@ -1104,7 +1091,7 @@ PAM_SMBPASS_SRC = '''${PAM_SMBPASS_SRC_0} ${PARAM_SRC} ${LIB_NONSMBD_SRC} ${PASS
${SMBLDAP_SRC} ${LIBSAMBA_SRC} \
${LIBTSOCKET_SRC}'''
-WBINFO_SRC = '''../nsswitch/wbinfo.c ${AFS_SETTOKEN_SRC}'''
+WBINFO_SRC = '''../nsswitch/wbinfo.c'''
WINBIND_NSS_SRC = '''${WBCOMMON_SRC} ${LIBREPLACE_SRC}'''
@@ -1161,6 +1148,7 @@ bld.RECURSE('build')
bld.RECURSE('../librpc')
bld.RECURSE('librpc/idl')
+bld.RECURSE('librpc')
bld.SAMBA_MKVERSION('include/version.h')
@@ -1320,13 +1308,21 @@ bld.SAMBA_SUBSYSTEM('LIBADS_PRINTER',
source=LIBADS_PRINTER_SRC,
vars=locals())
+bld.SAMBA_SUBSYSTEM('LIBAFS',
+ source=AFS_SRC,
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('LIBAFS_SETTOKEN',
+ source=AFS_SETTOKEN_SRC,
+ vars=locals())
+
bld.SAMBA_SUBSYSTEM('SMBD_BASE',
source=SMBD_SRC_BASE,
deps='''tdb tevent dl krb5 ldap gssapi gssapi_krb5
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''',
+ VFS_DEFAULT RPC_MODULES AUTH LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE''',
vars=locals())
bld.SAMBA_SUBSYSTEM('RPC_MODULES',
@@ -1336,6 +1332,19 @@ bld.SAMBA_SUBSYSTEM('RPC_MODULES',
RPC_NETLOGON RPC_NETDFS RPC_SRVSVC RPC_SPOOLSS
RPC_EVENTLOG''')
+bld.SAMBA_SUBSYSTEM('LOCKING',
+ source='${LOCKING_SRC}',
+ deps='''tdb talloc''',
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('PROFILE',
+ source='${PROFILE_SRC}',
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('READLINE',
+ source=READLINE_SRC,
+ vars=locals())
+
bld.SAMBA_SUBSYSTEM('LIBNDR',
source=LIBNDR_SRC,
vars=locals())
@@ -1398,7 +1407,8 @@ bld.SAMBA_BINARY('winbindd/winbindd',
deps='''talloc tdb tevent cap dl ZLIB NSS_WRAPPER
libwbclient PASSDB ldap resolv PARAM LIB_NONSMBD LIBSMB
POPT_SAMBA KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER
- NSS_INFO_TEMPLATE
+ NSS_INFO_TEMPLATE SRV_NDR_WBINT RPCCLI_NDR_WBINT LIBAFS
+ LIBAFS_SETTOKEN PROFILE
''',
enabled=bld.env.build_winbind,
install_path='${SBINDIR}',
@@ -1408,7 +1418,7 @@ bld.SAMBA_BINARY('web/swat',
source=SWAT_SRC,
deps='''talloc tevent cap LIBS LIBSMB libwbclient PARAM
LIB_NONSMBD resolv PASSDB POPT_SAMBA KRBCLIENT cups
- LIBMSRPC_GEN LIBMSRPC''',
+ LIBMSRPC_GEN LIBMSRPC LOCKING''',
enabled=bld.env.build_swat,
install_path='${SBINDIR}',
vars=locals())
@@ -1417,21 +1427,21 @@ bld.SAMBA_BINARY('rpcclient/rpcclient',
source=RPCCLIENT_SRC,
deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC
- LIBADS''',
+ LIBADS READLINE''',
vars=locals())
bld.SAMBA_BINARY('smbclient',
source=CLIENT_SRC,
deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN
- LIBMSRPC''',
+ LIBMSRPC READLINE''',
vars=locals())
bld.SAMBA_BINARY('net',
source=NET_SRC,
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''',
+ LOCALE_DIR LIBAFS LIBAFS_SETTOKEN READLINE''',
vars=locals())
bld.SAMBA_BINARY('profiles',
@@ -1461,7 +1471,7 @@ bld.SAMBA_BINARY('smbta-util',
bld.SAMBA_BINARY('smbstatus',
source=STATUS_SRC,
deps='''talloc tdb tevent cap PARAM POPT_SAMBA LIB_NONSMBD
- LIBSMB_ERR''',
+ LIBSMB_ERR LOCKING PROFILE''',
vars=locals())
bld.SAMBA_BINARY('smbcontrol',
@@ -1472,7 +1482,7 @@ bld.SAMBA_BINARY('smbcontrol',
bld.SAMBA_BINARY('smbtree',
source=SMBTREE_SRC,
deps='''talloc tdb tevent cap resolv libwbclient PARAM LIB_NONSMBD
- LIBSMB LIBSMB_ERR POPT_SAMBA KRBCLIENT PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC''',
+ LIBSMB LIBSMB_ERR POPT_SAMBA KRBCLIENT PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC PROFILE''',
vars=locals())
bld.SAMBA_BINARY('smbpasswd',
@@ -1546,7 +1556,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''',
+ ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC LOCKING''',
vars=locals())
bld.SAMBA_BINARY('nsstest',
@@ -1562,7 +1572,7 @@ bld.SAMBA_BINARY('pdbtest',
bld.SAMBA_BINARY('vfstest',
source=VFSTEST_SRC,
- deps='''SMBD_BASE''',
+ deps='''SMBD_BASE READLINE''',
vars=locals())
bld.SAMBA_BINARY('smbiconv',
@@ -1578,7 +1588,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''',
+ ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC LOCKING''',
vars=locals())
bld.SAMBA_BINARY('debug2html',
@@ -1600,7 +1610,7 @@ bld.SAMBA_BINARY('wbinfo',
source=WBINFO_SRC,
deps='''talloc libwbclient tevent cap
NSS_WRAPPER ASN1_UTIL LIBTSOCKET PASSDB ldap PARAM LIB_NONSMBD
- LIBSAMBA POPT_SAMBA''',
+ LIBSAMBA POPT_SAMBA LIBAFS_SETTOKEN''',
vars=locals())
bld.SAMBA_BINARY('ntlm_auth',
--
Samba Shared Repository
More information about the samba-cvs
mailing list