[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Tue Nov 30 10:59:02 MST 2010
The branch, master has been updated
via d245ec8 s3-waf: add LIBDRSUAPI subsystem.
via 193daf8 s3-waf: let SMBD_BASE depend on NDR_NOTIFY.
via a5ede16 s3-waf: let LIBSMB (in fact LIBNBT) depend on NDR_NBT.
via 4ca43d9 s3-waf: let LIBSMB (in fact LIBNBT) depend on NDR_SVCCTL.
via 5db1a39 s3-waf: convert LIBCLI_SPOOLSS into a subsystem.
via e80e5c5 s3-waf: convert RPCCLI_EPMAPPER into a subsystem.
via aaa31e7 s3-waf: convert RPCCLI_EVENTLOG into a subsystem.
via d29f9e4 s3-waf: convert RPCCLI_NTSVCS into a subsystem.
via d37f54d s3-waf: convert RPCCLI_DRSUAPI into a subsystem.
via ac29057 s3-waf: convert RPCCLI_DFS into a subsystem.
via 5cedef3 s3-waf: convert RPCCLI_INITSHUTDOWN into a subsystem.
via 82b4408 s3-waf: convert RPCCLI_DSSETUP into a subsystem.
via 2013c9c s3-waf: convert RPCCLI_SVCCTL into a subsystem.
via a8d005d s3-waf: convert RPCCLI_WKSSVC into a subsystem.
via f9f9b79 s3-waf: convert RPCCLI_SRVSVC into a subsystem.
via 75f088f s3-waf: convert LIBCLI_NETLOGON into a subsystem.
via 656e849 s3-waf: convert LIBCLI_LSA into a subsystem.
via d16e77e s3-waf: convert LIBCLI_SAMR into a subsystem.
via 2beab2d s3-waf: convert PARAM_UTIL into a subsystem.
via 33c82cd s3-waf: convert TOKEN_UTIL into a subsystem.
from b2a1c1e s3-waf: convert REG_EVENTLOG into a subsystem.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d245ec848280f2120626e984dea2756c033c93f1
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 18:07:21 2010 +0100
s3-waf: add LIBDRSUAPI subsystem.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Tue Nov 30 18:58:42 CET 2010 on sn-devel-104
commit 193daf857729073d3166ea5e377ed1743cd2b26b
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 18:01:13 2010 +0100
s3-waf: let SMBD_BASE depend on NDR_NOTIFY.
Guenther
commit a5ede16bb7462eed6f709ab2b4118db3e498d6a3
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:58:13 2010 +0100
s3-waf: let LIBSMB (in fact LIBNBT) depend on NDR_NBT.
Guenther
commit 4ca43d9bc1295e3bc28fb8b11ce8746c5af6524e
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:56:03 2010 +0100
s3-waf: let LIBSMB (in fact LIBNBT) depend on NDR_SVCCTL.
Guenther
commit 5db1a399d586fd665382e625a5cdd0d1b995df27
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:50:32 2010 +0100
s3-waf: convert LIBCLI_SPOOLSS into a subsystem.
Guenther
commit e80e5c5b8a88a23d3fdf11e52d5f3bef2cdeb31b
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:46:56 2010 +0100
s3-waf: convert RPCCLI_EPMAPPER into a subsystem.
Guenther
commit aaa31e7b22342157c9982107a6af67c06b01ef93
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:45:25 2010 +0100
s3-waf: convert RPCCLI_EVENTLOG into a subsystem.
Guenther
commit d29f9e4846d86002732f37703a5b21b759be745a
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:44:25 2010 +0100
s3-waf: convert RPCCLI_NTSVCS into a subsystem.
Guenther
commit d37f54d8807166b9008c9d3fa11789e1936f4c0e
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:43:09 2010 +0100
s3-waf: convert RPCCLI_DRSUAPI into a subsystem.
Guenther
commit ac290574e2ff49c9be880e545d1255f687dcc9ec
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:40:38 2010 +0100
s3-waf: convert RPCCLI_DFS into a subsystem.
Guenther
commit 5cedef39d7f4208d22ce3c7fd48c19d5f8a8e4d1
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:38:44 2010 +0100
s3-waf: convert RPCCLI_INITSHUTDOWN into a subsystem.
Guenther
commit 82b440835dfc24be114f08ee1f2824aba7ac7260
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:36:13 2010 +0100
s3-waf: convert RPCCLI_DSSETUP into a subsystem.
Guenther
commit 2013c9c391ee0324039842ec2f8acd4addd33d85
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:21:38 2010 +0100
s3-waf: convert RPCCLI_SVCCTL into a subsystem.
Guenther
commit a8d005d439489c939051436eb8dbb75ff1cf9fbe
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:19:12 2010 +0100
s3-waf: convert RPCCLI_WKSSVC into a subsystem.
Guenther
commit f9f9b798599262390cdec14d410fd3c8b94cd871
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:15:43 2010 +0100
s3-waf: convert RPCCLI_SRVSVC into a subsystem.
Guenther
commit 75f088f898993f7417520f2623611c689a58563b
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:27:37 2010 +0100
s3-waf: convert LIBCLI_NETLOGON into a subsystem.
Guenther
commit 656e849ce84c4b35e6f93ae8f4fe8780a4109e34
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:09:34 2010 +0100
s3-waf: convert LIBCLI_LSA into a subsystem.
Guenther
commit d16e77e1233b912d90d4c586176529d3361cc85e
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 16:43:34 2010 +0100
s3-waf: convert LIBCLI_SAMR into a subsystem.
Guenther
commit 2beab2d6e5704ecbac278ecd4c00dd162cda4197
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 16:25:37 2010 +0100
s3-waf: convert PARAM_UTIL into a subsystem.
Guenther
commit 33c82cd5dd67c8fa509c326fed85a90045d896d0
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 16:16:22 2010 +0100
s3-waf: convert TOKEN_UTIL into a subsystem.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/auth/wscript_build | 8 +-
source3/wscript_build | 275 ++++++++++++++++++++++----------------------
2 files changed, 141 insertions(+), 142 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build
index 0fd28bc..e740f87 100644
--- a/source3/auth/wscript_build
+++ b/source3/auth/wscript_build
@@ -10,7 +10,7 @@ AUTH_WBC_SRC = 'auth_wbc.c'
AUTH_SCRIPT_SRC = 'auth_script.c'
AUTH_NETLOGOND_SRC = 'auth_netlogond.c'
-AUTH_SRC = '''auth.c auth_util.c token_util.c
+AUTH_SRC = '''auth.c auth_util.c
server_info.c
server_info_sam.c
user_info.c
@@ -18,9 +18,13 @@ AUTH_SRC = '''auth.c auth_util.c token_util.c
user_krb5.c
auth_compat.c auth_ntlmssp.c'''
+bld.SAMBA_SUBSYSTEM('TOKEN_UTIL',
+ source='token_util.c',
+ vars=locals())
+
bld.SAMBA_SUBSYSTEM('auth',
source=AUTH_SRC,
- deps='''PLAINTEXT_AUTH SLCACHE DCUTIL''',
+ deps='''PLAINTEXT_AUTH SLCACHE DCUTIL TOKEN_UTIL''',
vars=locals())
bld.SAMBA_MODULE('auth_sam',
diff --git a/source3/wscript_build b/source3/wscript_build
index 89f16c4..fc1796a 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -29,11 +29,7 @@ SERVER_MUTEX_SRC = 'lib/server_mutex.c'
PASSCHANGE_SRC = '''libsmb/passchange.c'''
-LIBNDR_DRSUAPI_SRC = '''../librpc/ndr/ndr_drsuapi.c
- ../librpc/ndr/ndr_compression.c
- ../librpc/gen_ndr/ndr_drsuapi.c
- ../librpc/ndr/ndr_drsblobs.c
- ../librpc/gen_ndr/ndr_drsblobs.c'''
+LIBNDR_DRSUAPI_SRC = '../librpc/ndr/ndr_compression.c'
COMPRESSION_SRC = '../lib/compression/mszip.c'
@@ -48,67 +44,15 @@ LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c
../librpc/ndr/uuid.c
librpc/ndr/util.c'''
-LIBCLI_SPOOLSS_SRC = '''
- ../librpc/gen_ndr/cli_spoolss.c
- ../librpc/gen_ndr/ndr_spoolss_c.c
- rpc_client/cli_spoolss.c
+LIBCLI_SPOOLSS_SRC = '''rpc_client/cli_spoolss.c
rpc_client/init_spoolss.c'''
-LIBCLI_EVENTLOG_SRC = '''
- ../librpc/gen_ndr/cli_eventlog.c
- ../librpc/gen_ndr/ndr_eventlog_c.c'''
-
-LIBCLI_NTSVCS_SRC = '''
- ../librpc/gen_ndr/cli_ntsvcs.c
- ../librpc/gen_ndr/ndr_ntsvcs_c.c'''
-
-LIBCLI_DRSUAPI_SRC = '''
- ../librpc/gen_ndr/cli_drsuapi.c
- ../librpc/gen_ndr/ndr_drsuapi_c.c'''
-
-LIBCLI_DFS_SRC = '''
- ../librpc/gen_ndr/cli_dfs.c
- ../librpc/gen_ndr/ndr_dfs_c.c'''
-
-LIBCLI_INITSHUTDOWN_SRC = '''
- ../librpc/gen_ndr/cli_initshutdown.c
- ../librpc/gen_ndr/ndr_initshutdown_c.c'''
-
-LIBCLI_DSSETUP_SRC = '''
- ../librpc/gen_ndr/cli_dssetup.c
- ../librpc/gen_ndr/ndr_dssetup_c.c'''
-
-LIBCLI_SVCCTL_SRC = '''
- ../librpc/gen_ndr/cli_svcctl.c
- ../librpc/gen_ndr/ndr_svcctl_c.c'''
-
-LIBCLI_WKSSVC_SRC = '''
- ../librpc/gen_ndr/cli_wkssvc.c
- ../librpc/gen_ndr/ndr_wkssvc_c.c'''
-
-LIBCLI_SRVSVC_SRC = '''
- ../librpc/gen_ndr/cli_srvsvc.c
- ../librpc/gen_ndr/ndr_srvsvc_c.c'''
-
-LIBCLI_LSA_SRC = '''
- ../librpc/gen_ndr/cli_lsa.c
- ../librpc/gen_ndr/ndr_lsa_c.c
- rpc_client/cli_lsarpc.c
+LIBCLI_LSA_SRC = '''rpc_client/cli_lsarpc.c
rpc_client/init_lsa.c'''
-LIBCLI_SAMR_SRC = '''
- ../librpc/gen_ndr/cli_samr.c
- ../librpc/gen_ndr/ndr_samr_c.c
- rpc_client/cli_samr.c'''
+LIBCLI_SAMR_SRC = 'rpc_client/cli_samr.c'
-LIBCLI_NETLOGON_SRC = '''
- ../librpc/gen_ndr/cli_netlogon.c
- ../librpc/gen_ndr/ndr_netlogon_c.c
- rpc_client/cli_netlogon.c'''
-
-LIBCLI_EPMAPPER_SRC = '''
- ../librpc/gen_ndr/cli_epmapper.c
- ../librpc/gen_ndr/ndr_epmapper_c.c'''
+LIBCLI_NETLOGON_SRC = 'rpc_client/cli_netlogon.c'
# this includes only the low level parse code, not stuff
# that requires knowledge of security contexts
@@ -178,7 +122,9 @@ LIB_NONSMBD_SRC = '''${LIB_DUMMY_SRC}'''
POPT_LIB_SRC = '''lib/popt_common.c'''
-PARAM_WITHOUT_REG_SRC = '''param/loadparm.c param/util.c param/loadparm_server_role.c
+PARAM_UTIL_SRC = '''param/util.c'''
+
+PARAM_WITHOUT_REG_SRC = '''param/loadparm.c param/loadparm_server_role.c
lib/sharesec.c lib/ldap_debug_handler.c'''
KRBCLIENT_SRC = '''libads/kerberos.c libads/ads_status.c'''
@@ -206,10 +152,7 @@ SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c
LIBNBT_SRC = '''../libcli/nbt/nbtname.c
../libcli/netlogon.c
- ../libcli/ndr_netlogon.c
- ../librpc/gen_ndr/ndr_nbt.c
- ../librpc/gen_ndr/ndr_svcctl.c
- ../librpc/ndr/ndr_svcctl.c'''
+ ../libcli/ndr_netlogon.c'''
LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c
libsmb/namequery.c ../libcli/nbt/lmhosts.c libsmb/conncache.c
@@ -259,8 +202,7 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
libsmb/clistr.c libsmb/cliquota.c libsmb/clifsinfo.c libsmb/clidfs.c
libsmb/clioplock.c libsmb/clirap2.c
libsmb/smb_seal.c libsmb/async_smb.c
- ${LIBNBT_SRC}
- ${DRSUAPI_SRC}'''
+ ${LIBNBT_SRC}'''
LIBMSRPC_SRC = '''
${SCHANNEL_SRC}
@@ -275,8 +217,7 @@ LIBMSRPC_SRC = '''
../librpc/rpc/binding.c
../librpc/rpc/dcerpc_util.c
librpc/rpc/dcerpc_helpers.c
- ../librpc/rpc/binding_handle.c
- ${LIBCLI_EPMAPPER_SRC}'''
+ ../librpc/rpc/binding_handle.c'''
#
# registry-related objects
@@ -378,8 +319,7 @@ PROFILES_SRC = '''utils/profiles.c'''
OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c
smbd/oplock_onefs.c'''
-NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c
- librpc/gen_ndr/ndr_notify.c'''
+NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c'''
FNAME_UTIL_SRC = '''smbd/filename_util.c'''
@@ -473,7 +413,6 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
winbindd/winbindd_pam_auth_crap.c
winbindd/winbindd_pam_chng_pswd_auth_crap.c
auth/auth_util.c
- auth/token_util.c
auth/user_util.c
auth/check_samsec.c
auth/server_info.c
@@ -485,10 +424,6 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
WINBINDD_SRC = '''${WINBINDD_SRC1}
${RPC_NCACN_NP} ${NPA_TSTREAM_SRC}
${TDB_VALIDATE_SRC}
- ${LIBCLI_DSSETUP_SRC}
- ${LIBCLI_LSA_SRC}
- ${LIBCLI_SAMR_SRC}
- ${LIBCLI_NETLOGON_SRC}
rpc_client/init_netlogon.c
rpc_server/srv_lsa_nt.c ../librpc/gen_ndr/srv_lsa.c
rpc_server/srv_samr_nt.c ../librpc/gen_ndr/srv_samr.c
@@ -550,11 +485,6 @@ SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
${RPC_SERVER_SRC}
${OPLOCK_SRC} ${NOTIFY_SRC}
${BUILDOPT_SRC}
- ${LIBCLI_SPOOLSS_SRC}
- ${LIBCLI_SRVSVC_SRC}
- ${LIBCLI_LSA_SRC}
- ${LIBCLI_SAMR_SRC}
- ${LIBCLI_NETLOGON_SRC}
rpc_client/init_netlogon.c
rpc_client/init_samr.c'''
@@ -592,15 +522,13 @@ SWAT_SRC1 = '''web/cgi.c web/diagnose.c web/startstop.c web/statuspage.c
SWAT_SRC = '''${SWAT_SRC1}
${PASSCHANGE_SRC}
- ${LIBCLI_SAMR_SRC}
rpc_client/init_lsa.c'''
STATUS_SRC = '''utils/status.c utils/status_profile.c'''
SMBCONTROL_SRC = '''utils/smbcontrol.c'''
-SMBTREE_SRC = '''utils/smbtree.c
- ${LIBCLI_SRVSVC_SRC}'''
+SMBTREE_SRC = '''utils/smbtree.c'''
TESTPARM_SRC = 'utils/testparm.c'
@@ -611,7 +539,6 @@ TEST_LP_LOAD_SRC = '''param/test_lp_load.c'''
PASSWD_UTIL_SRC = 'utils/passwd_util.c'
SMBPASSWD_SRC = '''utils/smbpasswd.c ${PASSCHANGE_SRC}
- ${LIBCLI_SAMR_SRC}
rpc_client/init_lsa.c'''
PDBEDIT_SRC = '''utils/pdbedit.c'''
@@ -629,17 +556,6 @@ RPCCLIENT_SRC1 = '''rpcclient/rpcclient.c rpcclient/cmd_lsarpc.c
rpcclient/cmd_winreg.c'''
RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}
- ${LIBCLI_SPOOLSS_SRC}
- ${LIBCLI_EVENTLOG_SRC}
- ${LIBCLI_NTSVCS_SRC}
- ${LIBCLI_DRSUAPI_SRC}
- ${LIBCLI_DFS_SRC}
- ${LIBCLI_DSSETUP_SRC}
- ${LIBCLI_WKSSVC_SRC}
- ${LIBCLI_SRVSVC_SRC}
- ${LIBCLI_LSA_SRC}
- ${LIBCLI_SAMR_SRC}
- ${LIBCLI_NETLOGON_SRC}
rpc_client/init_netlogon.c
rpc_client/init_samr.c'''
@@ -661,9 +577,7 @@ LIBSMBCLIENT_SRC0 = '''libsmb/libsmb_cache.c
libsmb/libsmb_xattr.c
libsmb/libsmb_setget.c'''
-LIBSMBCLIENT_SRC1 = '''${LIBSMBCLIENT_SRC0}
- ${LIBCLI_SRVSVC_SRC}
- ${LIBCLI_LSA_SRC}'''
+LIBSMBCLIENT_SRC1 = '''${LIBSMBCLIENT_SRC0}'''
LIBSMBCLIENT_SRC = '${LIBSMBCLIENT_SRC1}'
@@ -688,13 +602,6 @@ LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
lib/netapi/netlogon.c'''
LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}
- auth/token_util.c
- ${LIBCLI_INITSHUTDOWN_SRC}
- ${LIBCLI_WKSSVC_SRC}
- ${LIBCLI_SRVSVC_SRC}
- ${LIBCLI_LSA_SRC}
- ${LIBCLI_SAMR_SRC}
- ${LIBCLI_NETLOGON_SRC}
rpc_client/init_netlogon.c
rpc_client/init_samr.c'''
@@ -704,7 +611,6 @@ CLIENT_SRC1 = '''client/client.c client/clitar.c
client/dnsbrowse.c'''
CLIENT_SRC = '''${CLIENT_SRC1}
- ${LIBCLI_SRVSVC_SRC}
rpc_client/init_lsa.c'''
LIBSMBCONF_SRC = '''../lib/smbconf/smbconf.c ../lib/smbconf/smbconf_util.c
@@ -740,21 +646,11 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
utils/net_dns.c utils/net_ads_gpo.c
utils/net_conf.c utils/net_join.c utils/net_user.c
utils/net_group.c utils/net_file.c utils/net_registry.c
- auth/token_util.c utils/net_dom.c utils/net_share.c
+ utils/net_dom.c utils/net_share.c
utils/net_g_lock.c
utils/net_serverid.c
utils/net_eventlog.c
utils/net_printing.c
- ${LIBCLI_SPOOLSS_SRC}
- ${LIBCLI_DRSUAPI_SRC}
- ${LIBCLI_INITSHUTDOWN_SRC}
- ${LIBCLI_DSSETUP_SRC}
- ${LIBCLI_SVCCTL_SRC}
- ${LIBCLI_WKSSVC_SRC}
- ${LIBCLI_SRVSVC_SRC}
- ${LIBCLI_LSA_SRC}
- ${LIBCLI_SAMR_SRC}
- ${LIBCLI_NETLOGON_SRC}
rpc_client/init_netlogon.c
rpc_client/init_samr.c
registry/reg_parse.c registry/reg_format.c
@@ -798,11 +694,9 @@ LOG2PCAP_SRC = '''utils/log2pcaphex.c'''
LOCKTEST2_SRC = '''torture/locktest2.c'''
-SMBCACLS_SRC = '''utils/smbcacls.c
- ${LIBCLI_LSA_SRC}'''
+SMBCACLS_SRC = '''utils/smbcacls.c'''
-SMBCQUOTAS_SRC = '''utils/smbcquotas.c
- ${LIBCLI_LSA_SRC}'''
+SMBCQUOTAS_SRC = '''utils/smbcquotas.c'''
EVTLOGADM_SRC0 = 'utils/eventlogadm.c'
@@ -837,8 +731,7 @@ NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}
VLP_SRC = '''printing/tests/vlp.c
../lib/util/util_tdb.c
- ${LIBSAMBAUTIL_SRC}
- param/util.c'''
+ ${LIBSAMBAUTIL_SRC}'''
RPC_OPEN_TCP_SRC = 'torture/rpc_open_tcp.c'
@@ -900,7 +793,9 @@ bld.SAMBA_LIBRARY('libnetapi',
public_deps='''talloc tdb cap libwbclient LIB_NONSMBD LIBSMB KRBCLIENT
PASSDB SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG
LIBMSRPC_GEN LIBMSRPC LIBADS LIBNET DCUTIL NDR_LIBNETAPI
- RPC_CLIENT_SCHANNEL LIBSMBCONF REG_SMBCONF''',
+ RPC_CLIENT_SCHANNEL LIBSMBCONF REG_SMBCONF TOKEN_UTIL
+ LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
+ RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_INITSHUTDOWN''',
public_headers='lib/netapi/netapi.h',
private_library=True,
vars=locals())
@@ -908,7 +803,7 @@ bld.SAMBA_LIBRARY('libnetapi',
bld.SAMBA_LIBRARY('libsmbclient',
source=LIBSMBCLIENT_SRC,
public_deps='''talloc tdb libwbclient cap PARAM LIB_NONSMBD LIBSMB KRBCLIENT PASSDB SMBLDAP GROUPDB
- LIBMSRPC_GEN LIBMSRPC''',
+ LIBMSRPC_GEN LIBMSRPC LIBCLI_LSA RPCCLI_SRVSVC''',
public_headers='include/libsmbclient.h',
private_library=True,
vars=locals())
@@ -922,7 +817,8 @@ bld.SAMBA_LIBRARY('smbsharemodes',
bld.SAMBA_SUBSYSTEM('LIBMSRPC',
source='${LIBMSRPC_SRC}',
- deps='ndr NDR_SECURITY NDR_DCERPC NDR_SCHANNEL',
+ deps='''ndr NDR_SECURITY NDR_DCERPC NDR_SCHANNEL
+ RPCCLI_EPMAPPER''',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBMSRPC_GEN',
@@ -963,8 +859,13 @@ bld.SAMBA_SUBSYSTEM('PASSDB',
deps='''GROUPDB TLDAP SECRETS SMBLDAP pdb''',
vars=locals())
+bld.SAMBA_SUBSYSTEM('PARAM_UTIL',
+ source=PARAM_UTIL_SRC)
+
bld.SAMBA_SUBSYSTEM('PARAM_WITHOUT_REG',
- source=PARAM_WITHOUT_REG_SRC)
+ source=PARAM_WITHOUT_REG_SRC,
+ deps='''PARAM_UTIL''',
+ vars=locals())
bld.SAMBA_SUBSYSTEM('PARAM',
source='',
@@ -1028,7 +929,12 @@ bld.SAMBA_SUBSYSTEM('LIBSAMBA',
bld.SAMBA_SUBSYSTEM('LIBSMB',
source=LIBSMB_SRC,
- deps='LIBSAMBA z LZXPRESS CLDAP LIBNMB',
+ deps='LIBSAMBA CLDAP LIBNMB LIBDRSUAPI',
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('LIBDRSUAPI',
+ source=DRSUAPI_SRC,
+ deps='z LZXPRESS NDR_SVCCTL NDR_NBT NDR_DRSUAPI NDR_DRSBLOBS',
vars=locals())
bld.SAMBA_SUBSYSTEM('CLDAP',
@@ -1080,8 +986,10 @@ bld.SAMBA_SUBSYSTEM('SMBD_BASE',
PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI
LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER
vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE
- PRINTING PRINTBACKEND NDR_XATTR REGFIO
+ PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY REGFIO
LIBSMBCONF REG_FULL FNAME_UTIL
+ LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
+ RPCCLI_SRVSVC
''',
vars=locals())
@@ -1205,6 +1113,78 @@ bld.SAMBA_SUBSYSTEM('RPCCLI_ECHO',
source='../librpc/gen_ndr/cli_echo.c',
public_deps='RPC_NDR_ECHO')
+bld.SAMBA_SUBSYSTEM('RPCCLI_SAMR',
+ source='../librpc/gen_ndr/cli_samr.c',
+ public_deps='RPC_NDR_SAMR')
+
+bld.SAMBA_SUBSYSTEM('RPCCLI_LSA',
+ source='../librpc/gen_ndr/cli_lsa.c',
+ public_deps='RPC_NDR_LSA')
+
+bld.SAMBA_SUBSYSTEM('RPCCLI_NETLOGON',
+ source='../librpc/gen_ndr/cli_netlogon.c',
+ public_deps='RPC_NDR_NETLOGON')
+
+bld.SAMBA_SUBSYSTEM('RPCCLI_SRVSVC',
+ source='../librpc/gen_ndr/cli_srvsvc.c',
+ public_deps='RPC_NDR_SRVSVC')
+
+bld.SAMBA_SUBSYSTEM('RPCCLI_INITSHUTDOWN',
+ source='../librpc/gen_ndr/cli_initshutdown.c',
+ public_deps='RPC_NDR_INITSHUTDOWN')
+
+bld.SAMBA_SUBSYSTEM('RPCCLI_WKSSVC',
+ source='../librpc/gen_ndr/cli_wkssvc.c',
+ public_deps='RPC_NDR_WKSSVC')
+
+bld.SAMBA_SUBSYSTEM('RPCCLI_SVCCTL',
+ source='../librpc/gen_ndr/cli_svcctl.c',
+ public_deps='RPC_NDR_SVCCTL')
+
+bld.SAMBA_SUBSYSTEM('RPCCLI_DSSETUP',
+ source='../librpc/gen_ndr/cli_dssetup.c',
+ public_deps='RPC_NDR_DSSETUP')
+
+bld.SAMBA_SUBSYSTEM('RPCCLI_DFS',
+ source='../librpc/gen_ndr/cli_dfs.c',
+ public_deps='RPC_NDR_DFS')
+
+bld.SAMBA_SUBSYSTEM('RPCCLI_DRSUAPI',
+ source='../librpc/gen_ndr/cli_drsuapi.c',
+ public_deps='RPC_NDR_DRSUAPI')
+
+bld.SAMBA_SUBSYSTEM('RPCCLI_NTSVCS',
+ source='../librpc/gen_ndr/cli_ntsvcs.c',
+ public_deps='RPC_NDR_NTSVCS')
+
+bld.SAMBA_SUBSYSTEM('RPCCLI_EVENTLOG',
+ source='../librpc/gen_ndr/cli_eventlog.c',
+ public_deps='RPC_NDR_EVENTLOG')
+
+bld.SAMBA_SUBSYSTEM('RPCCLI_EPMAPPER',
+ source='../librpc/gen_ndr/cli_epmapper.c',
+ public_deps='RPC_NDR_EPMAPPER')
+
+bld.SAMBA_SUBSYSTEM('RPCCLI_SPOOLSS',
+ source='../librpc/gen_ndr/cli_spoolss.c',
+ public_deps='RPC_NDR_SPOOLSS')
+
+bld.SAMBA_SUBSYSTEM('LIBCLI_SAMR',
+ source=LIBCLI_SAMR_SRC,
+ deps='RPCCLI_SAMR')
+
+bld.SAMBA_SUBSYSTEM('LIBCLI_LSA',
+ source=LIBCLI_LSA_SRC,
+ deps='RPCCLI_LSA')
+
+bld.SAMBA_SUBSYSTEM('LIBCLI_NETLOGON',
+ source=LIBCLI_NETLOGON_SRC,
+ deps='RPCCLI_NETLOGON')
+
+bld.SAMBA_SUBSYSTEM('LIBCLI_SPOOLSS',
+ source=LIBCLI_SPOOLSS_SRC,
+ deps='RPCCLI_SPOOLSS')
+
bld.SAMBA_SUBSYSTEM('RPC_CLIENT_SCHANNEL',
source=RPC_CLIENT_SCHANNEL_SRC,
vars=locals())
@@ -1233,6 +1213,9 @@ bld.SAMBA_BINARY('winbindd/winbindd',
POPT_SAMBA KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER
SRV_NDR_WBINT RPCCLI_NDR_WBINT LIBAFS
LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info
+ TOKEN_UTIL
+ LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
+ RPCCLI_DSSETUP
''',
enabled=bld.env.build_winbind,
install_path='${SBINDIR}',
@@ -1242,7 +1225,8 @@ 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 LOCKING PLAINTEXT_AUTH PRINTBASE PRINTING FNAME_UTIL''',
+ LIBMSRPC_GEN LIBMSRPC LOCKING PLAINTEXT_AUTH PRINTBASE PRINTING FNAME_UTIL
+ LIBCLI_SAMR''',
enabled=bld.env.build_swat,
install_path='${SBINDIR}',
vars=locals())
@@ -1252,14 +1236,18 @@ bld.SAMBA_BINARY('rpcclient/rpcclient',
deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC
LIBADS SMBREADLINE DCUTIL RPCCLI_WINREG RPCCLI_ECHO
- RPC_CLIENT_SCHANNEL''',
+ RPC_CLIENT_SCHANNEL
--
Samba Shared Repository
More information about the samba-cvs
mailing list