[SCM] Samba Shared Repository - branch v3-6-test updated
Günther Deschner
gd at samba.org
Fri Dec 17 04:45:53 MST 2010
The branch, v3-6-test has been updated
via af428d7 s4-waf: nsstest only needs replace.
via 6a3a9a7 s3-waf: use shared libwbclient wscript_build.
via f7a30bd s3-waf: fix winbind-client subsystem.
via 9c6d43d s3-waf: add libkrb5 winbind locator plugin.
via 696b363 s3-waf: rework rpc_server handling a bit.
from 31c671d s4-smbtorture: skip level 8 checks in test_GetDriverInfo_winreg for w2k3.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit af428d722a15047cbaa5855ef8c8af257b22137c
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 15 15:39:47 2010 +0100
s4-waf: nsstest only needs replace.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Thu Dec 16 11:40:52 CET 2010 on sn-devel-104
(cherry picked from commit ba21b6e3d439d7c1890900b1b0b88c42548f63f0)
commit 6a3a9a7818adf7a040b165553e9157985e7969b3
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 15 10:21:16 2010 +0100
s3-waf: use shared libwbclient wscript_build.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Wed Dec 15 11:42:16 CET 2010 on sn-devel-104
(cherry picked from commit af99f0a06714e56149bf2c6f801d28ae808cc34a)
commit f7a30bd99004b160d48efb43a5e881b70b428570
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 15 10:11:34 2010 +0100
s3-waf: fix winbind-client subsystem.
Guenther
(cherry picked from commit 550046a4d93cd700a18063f13f5a61ef6427e7cd)
commit 9c6d43d6793879ac5a4f2b0f9f43e8d9387f864b
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 15 10:04:34 2010 +0100
s3-waf: add libkrb5 winbind locator plugin.
Guenther
(cherry picked from commit 7ecec74a002b2decde1be01b8389de1b9d227acd)
commit 696b3631e1e9d86901b34e24b3def1f1f96fdfb5
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 15 00:33:21 2010 +0100
s3-waf: rework rpc_server handling a bit.
Guenther
(cherry picked from commit 5130e4a6226115817cb18be265c47f5290d1aedc)
-----------------------------------------------------------------------
Summary of changes:
nsswitch/libwbclient/wscript_build | 1 +
nsswitch/wscript_build | 2 +-
source3/rpc_server/wscript_build | 19 +++++++++++-
source3/wscript_build | 56 +++++++++++------------------------
4 files changed, 38 insertions(+), 40 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/libwbclient/wscript_build b/nsswitch/libwbclient/wscript_build
index 6e01b1b..896e17d 100644
--- a/nsswitch/libwbclient/wscript_build
+++ b/nsswitch/libwbclient/wscript_build
@@ -3,5 +3,6 @@
bld.SAMBA_LIBRARY('wbclient',
source='wbc_guid.c wbc_idmap.c wbclient.c wbc_pam.c wbc_pwd.c wbc_sid.c wbc_util.c',
deps='winbind-client',
+ public_headers='wbclient.h',
private_library=True
)
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index acb7313..4baed1c 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -10,7 +10,7 @@ bld.SAMBA_LIBRARY('winbind-client',
bld.SAMBA_BINARY('nsstest',
source='nsstest.c',
- deps='samba-util samba-hostconfig'
+ deps='replace'
)
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
index c56a234..145e00e 100644
--- a/source3/rpc_server/wscript_build
+++ b/source3/rpc_server/wscript_build
@@ -19,7 +19,8 @@ RPC_EVENTLOG_SRC = '''srv_eventlog_nt.c ../../librpc/gen_ndr/srv_eventlog.c'''
RPC_RPCECHO_SRC = '''srv_echo_nt.c ../../librpc/gen_ndr/srv_echo.c'''
bld.SAMBA_SUBSYSTEM('rpc',
- source='srv_pipe_register.c',
+ source='',
+ deps='RPC_PIPE_REGISTER',
vars=locals())
bld.SAMBA_SUBSYSTEM('RPC_SAMR',
@@ -31,6 +32,22 @@ bld.SAMBA_SUBSYSTEM('RPC_LSARPC',
source=RPC_LSARPC_SRC,
vars=locals())
+bld.SAMBA_SUBSYSTEM('RPC_NCACN_NP',
+ source='rpc_ncacn_np.c rpc_handles.c')
+
+bld.SAMBA_SUBSYSTEM('RPC_SERVICE',
+ source='rpc_server.c')
+
+bld.SAMBA_SUBSYSTEM('RPC_CRYPTO',
+ source='dcesrv_ntlmssp.c dcesrv_gssapi.c dcesrv_spnego.c')
+
+bld.SAMBA_SUBSYSTEM('RPC_PIPE_REGISTER',
+ source='srv_pipe_register.c')
+
+bld.SAMBA_SUBSYSTEM('RPC_SERVER',
+ source='srv_pipe_hnd.c srv_pipe.c',
+ deps='RPC_NCACN_NP RPC_SERVICE RPC_CRYPTO')
+
bld.SAMBA_MODULE('rpc_lsarpc',
subsystem='rpc',
source='../../librpc/gen_ndr/srv_lsa.c',
diff --git a/source3/wscript_build b/source3/wscript_build
index fbeb33d..62cd11f 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -259,20 +259,6 @@ SERVICES_SRC = '''services/svc_spoolss.c
LIB_EVENTLOG_SRC = '''lib/eventlog/eventlog.c'''
-RPC_NCACN_NP = '''rpc_server/rpc_ncacn_np.c
- rpc_server/rpc_handles.c'''
-
-RPC_SERVICE = '''rpc_server/rpc_server.c'''
-
-RPC_CRYPTO = '''rpc_server/dcesrv_ntlmssp.c
- rpc_server/dcesrv_gssapi.c
- rpc_server/dcesrv_spnego.c'''
-
-RPC_PIPE_SRC = '''rpc_server/srv_pipe_hnd.c rpc_server/srv_pipe.c
- ${RPC_NCACN_NP} ${RPC_SERVICE} ${RPC_CRYPTO}'''
-
-RPC_SERVER_SRC = '''${RPC_PIPE_SRC}'''
-
RPC_CLIENT_SCHANNEL_SRC = '''rpc_client/cli_pipe_schannel.c'''
LOCKING_SRC = '''locking/locking.c locking/brlock.c locking/posix.c'''
@@ -400,11 +386,9 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
../nsswitch/libwbclient/wb_reqtrans.c'''
WINBINDD_SRC = '''${WINBINDD_SRC1}
- ${RPC_NCACN_NP}
${TDB_VALIDATE_SRC}
../librpc/gen_ndr/srv_lsa.c
- ../librpc/gen_ndr/srv_samr.c
- rpc_server/srv_pipe_register.c'''
+ ../librpc/gen_ndr/srv_samr.c'''
MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c'''
@@ -456,7 +440,6 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
${MANGLE_SRC}'''
SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
- ${RPC_SERVER_SRC}
${OPLOCK_SRC} ${NOTIFY_SRC}
${BUILDOPT_SRC}'''
@@ -732,20 +715,10 @@ bld.RECURSE('../libcli/security')
######################## SUBSYSTEMS #################################
-bld.SAMBA_SUBSYSTEM('WBCOMMON',
- source=WBCOMMON_SRC)
-
-bld.SAMBA_LIBRARY('wbclient',
- source='''../nsswitch/libwbclient/wbc_guid.c
- ../nsswitch/libwbclient/wbc_idmap.c
- ../nsswitch/libwbclient/wbclient.c
- ../nsswitch/libwbclient/wbc_pam.c
- ../nsswitch/libwbclient/wbc_pwd.c
- ../nsswitch/libwbclient/wbc_sid.c
- ../nsswitch/libwbclient/wbc_util.c''',
- public_headers='../nsswitch/libwbclient/wbclient.h',
- private_library=True,
- public_deps='WBCOMMON')
+bld.SAMBA_SUBSYSTEM('winbind-client',
+ source=WBCOMMON_SRC,
+ deps='replace',
+ cflags='-DSOCKET_WRAPPER_DISABLE=1 -DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR)
bld.SAMBA_LIBRARY('netapi',
source=LIBNETAPI_SRC,
@@ -777,13 +750,13 @@ bld.SAMBA_LIBRARY('smbsharemodes',
bld.SAMBA_LIBRARY('nss_winbind',
source='../nsswitch/winbind_nss_linux.c',
- deps='WBCOMMON',
+ deps='winbind-client',
realname='libnss_winbind.so.2',
vnum='2')
bld.SAMBA_LIBRARY('nss_wins',
source=WINBIND_WINS_NSS_SRC,
- deps='''WBCOMMON PARAM LIBSMB LIB_NONSMBD LIBTSOCKET KRBCLIENT
+ deps='''winbind-client PARAM LIBSMB LIB_NONSMBD LIBTSOCKET KRBCLIENT
cap wbclient''',
realname='libnss_wins.so.2',
vnum='2')
@@ -791,10 +764,16 @@ bld.SAMBA_LIBRARY('nss_wins',
if bld.CONFIG_SET('WITH_PAM_MODULES'):
bld.SAMBA_LIBRARY('pamwinbind',
source=PAM_WINBIND_SRC,
- deps='intl talloc wbclient WBCOMMON LIBINIPARSER pam',
+ deps='intl talloc wbclient winbind-client LIBINIPARSER pam',
cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
realname='pam_winbind.so')
+if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
+ bld.SAMBA_LIBRARY('winbind_krb5_locator',
+ source='../nsswitch/winbind_krb5_locator.c',
+ deps='wbclient krb5',
+ vnum='0')
+
bld.SAMBA_SUBSYSTEM('LIBMSRPC',
source='${LIBMSRPC_SRC}',
deps='''ndr NDR_SECURITY NDR_DCERPC NDR_SCHANNEL
@@ -964,7 +943,7 @@ bld.SAMBA_SUBSYSTEM('SMBD_BASE',
LIBSMBCONF REG_FULL FNAME_UTIL
LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
RPCCLI_SRVSVC NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON INIT_SAMR
- LIBCLI_SMB_COMMON
+ LIBCLI_SMB_COMMON RPC_SERVER
''',
vars=locals())
@@ -1225,7 +1204,7 @@ bld.SAMBA_BINARY('winbindd/winbindd',
TOKEN_UTIL
LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
RPCCLI_DSSETUP NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON
- RPC_SAMR RPC_LSARPC
+ RPC_NCACN_NP RPC_PIPE_REGISTER RPC_SAMR RPC_LSARPC
''',
enabled=bld.env.build_winbind,
install_path='${SBINDIR}',
@@ -1452,7 +1431,7 @@ bld.SAMBA_BINARY('ntlm_auth',
source=NTLM_AUTH_SRC,
deps='''tdb talloc cap resolv krb5 k5crypto com_err wbclient PARAM LIB_NONSMBD
LIBS LIBSAMBA POPT_SAMBA ASN1_UTIL LIBTSOCKET
- PASSDB GROUPDB SMBLDAP WBCOMMON LIBINIPARSER LIBADS_SERVER
+ PASSDB GROUPDB SMBLDAP winbind-client LIBINIPARSER LIBADS_SERVER
NDR_SAMR NDR_LSA NDR_NETLOGON LIBCLI_LDAP_NDR LIBNMB SLCACHE SPNEGO_PARSE''',
vars=locals())
@@ -1515,6 +1494,7 @@ bld.RECURSE('../libcli/samsync')
bld.RECURSE('../libcli/named_pipe_auth')
bld.RECURSE('../libcli/smb')
bld.RECURSE('../libcli/ldap')
+bld.RECURSE('../nsswitch/libwbclient')
bld.RECURSE('modules')
bld.RECURSE('auth')
bld.RECURSE('passdb')
--
Samba Shared Repository
More information about the samba-cvs
mailing list