[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Tue Dec 14 15:30:01 MST 2010
The branch, master has been updated
via 4f4f769 s3-waf: add missing libnss_wins.so.2 library.
via 9e6736c s3-waf: recurse into ../libcli/ldap.
via 3e6d507 s3-waf: recurse into ../libcli/smb.
via f2bd9e5 s3-waf: recurse into ../libcli/samsync.
via baabd56 s3-waf: recurse into ../libcli/named_pipe_auth.
via 217ca2a s3-waf: recurse into ../libcli/drsuapi.
via d860281 s3-waf: add pam_ and nss_winbind.
via a13b993 s3-waf: check for "WITH_PAM_MODULES" to determine pam_smbpass build.
via 1202e63 s3-waf: fix pamsmbpass libwbclient dependency.
via 906e489 s3-waf: recurse into ../libcli/auth.
via 4c459a9 s3-waf: add CHARSET subsystem.
via 943f485 s3-waf: convert UTIL_SRC into a subsystem samba-util, similar to the s4 one.
via 192838a s3-waf: convert lib/util_tdb.c into a subsystem.
via 2407e33 s3-waf: use shared LIBASYNC_REQ subsystem.
via 0990f63 s4-smbtorture: paranoia check for architectures in request and reply for enumdrivers test.
from 77c1747 build: fix bad syntax
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4f4f7694c1a8d973b808f7a6b68fbc04147fcfab
Author: Günther Deschner <gd at samba.org>
Date: Tue Dec 14 22:18:43 2010 +0100
s3-waf: add missing libnss_wins.so.2 library.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Tue Dec 14 23:29:25 CET 2010 on sn-devel-104
commit 9e6736cafd5ea86294b780f32511a1317df94b3f
Author: Günther Deschner <gd at samba.org>
Date: Tue Dec 14 22:09:44 2010 +0100
s3-waf: recurse into ../libcli/ldap.
Guenther
commit 3e6d507246705be877eda61c38868ef29bef6265
Author: Günther Deschner <gd at samba.org>
Date: Tue Dec 14 17:47:46 2010 +0100
s3-waf: recurse into ../libcli/smb.
Guenther
commit f2bd9e52b80a1059f4eb22d9aa85097afe939e16
Author: Günther Deschner <gd at samba.org>
Date: Tue Dec 14 17:45:33 2010 +0100
s3-waf: recurse into ../libcli/samsync.
Guenther
commit baabd56ce94143d6ebf92c8818f53e364152fe19
Author: Günther Deschner <gd at samba.org>
Date: Tue Dec 14 17:36:06 2010 +0100
s3-waf: recurse into ../libcli/named_pipe_auth.
Guenther
commit 217ca2a2c9e9914ba02a8cc5477c2b8ea5e5372e
Author: Günther Deschner <gd at samba.org>
Date: Tue Dec 14 17:33:49 2010 +0100
s3-waf: recurse into ../libcli/drsuapi.
Guenther
commit d860281cd9248b699875a1c4791c7e0cb841da6a
Author: Günther Deschner <gd at samba.org>
Date: Tue Dec 14 17:14:58 2010 +0100
s3-waf: add pam_ and nss_winbind.
Guenther
commit a13b99323712a3bdd362de06179d0c23dbda0d79
Author: Günther Deschner <gd at samba.org>
Date: Tue Dec 14 17:14:30 2010 +0100
s3-waf: check for "WITH_PAM_MODULES" to determine pam_smbpass build.
Guenther
commit 1202e6328bb6009f8fb490c44d13a6930cdd3646
Author: Günther Deschner <gd at samba.org>
Date: Tue Dec 14 17:13:46 2010 +0100
s3-waf: fix pamsmbpass libwbclient dependency.
Guenther
commit 906e489af921a6e66d36aad1778d0cd486ce8287
Author: Günther Deschner <gd at samba.org>
Date: Tue Dec 14 14:03:22 2010 +0100
s3-waf: recurse into ../libcli/auth.
Guenther
commit 4c459a926f5e5aade9068497276953bbe3d49a97
Author: Günther Deschner <gd at samba.org>
Date: Tue Dec 14 16:47:35 2010 +0100
s3-waf: add CHARSET subsystem.
Guenther
commit 943f485ef187d66fdc98dcc30b91968b30c3dc5a
Author: Günther Deschner <gd at samba.org>
Date: Tue Dec 14 13:50:30 2010 +0100
s3-waf: convert UTIL_SRC into a subsystem samba-util, similar to the s4 one.
Guenther
commit 192838aafdf2e696c33e7443b9e74893309158b2
Author: Günther Deschner <gd at samba.org>
Date: Tue Dec 14 13:27:24 2010 +0100
s3-waf: convert lib/util_tdb.c into a subsystem.
Guenther
commit 2407e33c7667fbaabff84edf81c13526a06ebac5
Author: Günther Deschner <gd at samba.org>
Date: Tue Dec 14 13:14:00 2010 +0100
s3-waf: use shared LIBASYNC_REQ subsystem.
Guenther
commit 0990f6342ed3f765c482ddf0baddeac850422352
Author: Günther Deschner <gd at samba.org>
Date: Mon Dec 13 15:46:05 2010 +0100
s4-smbtorture: paranoia check for architectures in request and reply for enumdrivers test.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/pam_smbpass/wscript_build | 4 +-
source3/wscript_build | 115 +++++++++++++++++++++----------------
source4/torture/rpc/spoolss.c | 10 +++
3 files changed, 78 insertions(+), 51 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/pam_smbpass/wscript_build b/source3/pam_smbpass/wscript_build
index 39e615e..1a43bce 100644
--- a/source3/pam_smbpass/wscript_build
+++ b/source3/pam_smbpass/wscript_build
@@ -1,12 +1,12 @@
#!/usr/bin/env python
-if bld.CONFIG_SET('HAVE_PAM_START'):
+if bld.CONFIG_SET('WITH_PAM_MODULES'):
bld.SAMBA_LIBRARY('pamsmbpass',
source='''pam_smb_auth.c
pam_smb_passwd.c
pam_smb_acct.c
support.c''',
- deps='''tdb talloc pam libwbclient cap ASN1_UTIL PARAM LIB_NONSMBD PASSDB GROUPDB SMBLDAP
+ deps='''tdb talloc pam wbclient cap ASN1_UTIL PARAM LIB_NONSMBD PASSDB GROUPDB SMBLDAP
LIBSAMBA LIBTSOCKET''',
cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
realname='pam_smbpass.so',
diff --git a/source3/wscript_build b/source3/wscript_build
index cf5293b..3c8d2cd 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,7 +3,7 @@
from samba_utils import *
import samba_version
-TDB_LIB_SRC = '''lib/util_tdb.c ../lib/util/util_tdb.c
+TDB_LIB_SRC = '''../lib/util/util_tdb.c
lib/dbwrap.c lib/dbwrap_tdb.c
lib/dbwrap_ctdb.c
lib/g_lock.c
@@ -78,16 +78,16 @@ PTHREADPOOL_SRC = ''
LIBREPLACE_SRCS = ''
-LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC}
+LIB_SRC = '''${LIBSAMBAUTIL_SRC}
lib/messages.c lib/messages_local.c
lib/messages_ctdbd.c lib/packet.c lib/ctdbd_conn.c
lib/interfaces.c lib/memcache.c
lib/talloc_dict.c
lib/util_sconn.c
lib/serverid.c
- lib/util_transfer_file.c ../lib/async_req/async_sock.c
+ lib/util_transfer_file.c
${TDB_LIB_SRC}
- ${VERSION_SRC} lib/charcnv.c lib/debug.c lib/fault.c
+ ${VERSION_SRC} lib/debug.c lib/fault.c
lib/interface.c lib/pidfile.c
lib/system.c lib/sendfile.c lib/recvfile.c lib/time.c
lib/username.c
@@ -95,15 +95,15 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC}
lib/access.c lib/smbrun.c
lib/bitmap.c lib/dprintf.c ${UTIL_REG_SRC}
lib/wins_srv.c
- lib/util_str.c lib/clobber.c lib/util_sid.c
- lib/util_unistr.c lib/util_file.c
+ lib/clobber.c lib/util_sid.c
+ lib/util_file.c
lib/util.c lib/util_names.c
lib/util_sock.c lib/sock_exec.c lib/util_sec.c
lib/substitute.c lib/dbwrap_util.c
lib/ms_fnmatch.c lib/errmap_unix.c
lib/tallocmsg.c lib/dmallocmsg.c
libsmb/clisigning.c libsmb/smb_signing.c
- lib/iconv.c lib/pam_errors.c intl/lang_tdb.c
+ lib/pam_errors.c intl/lang_tdb.c
lib/conn_tdb.c lib/adt_tree.c lib/gencache.c
lib/sessionid_tdb.c
lib/module.c lib/events.c ${LIBTEVENT_SRC0}
@@ -153,19 +153,13 @@ LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c
libsmb/namequery.c ../libcli/nbt/lmhosts.c libsmb/conncache.c
libads/dns.c libads/sitename_cache.c'''
-NTERR_SRC = '''libsmb/nterr.c libsmb/smberr.c'''
-DOSERR_SRC = '../libcli/util/doserr.c'
+NTERR_SRC = '''libsmb/smberr.c'''
ERRORMAP_SRC = 'libsmb/errormap.c'
DCE_RPC_ERR_SRC = '../librpc/rpc/dcerpc_error.c'
-LIBSMB_ERR_SRC0 = '''${NTERR_SRC} ${DOSERR_SRC} ${ERRORMAP_SRC} ${DCE_RPC_ERR_SRC}'''
-
-LIBSMB_ERR_SRC1 = '''../libcli/auth/smbdes.c ../libcli/auth/smbencrypt.c ../libcli/auth/msrpc_parse.c ../libcli/auth/session.c'''
-
-LIBSMB_ERR_SRC = '${LIBSMB_ERR_SRC0} ${LIBSMB_ERR_SRC1}'
+LIBSMB_ERR_SRC = '''${NTERR_SRC} ${ERRORMAP_SRC} ${DCE_RPC_ERR_SRC}'''
LIBSMB_SRC0 = '''
- ../libcli/auth/ntlm_check.c
libsmb/ntlmssp.c
libsmb/ntlmssp_wrap.c
../libcli/auth/ntlmssp.c
@@ -175,18 +169,13 @@ LIBSMB_SRC0 = '''
LIBSAMBA_SRC = '${LIBSMB_SRC0}'
-LIBCLI_LDAP_MESSAGE_SRC = '''../libcli/ldap/ldap_message.c'''
-LIBCLI_LDAP_NDR_SRC = '''../libcli/ldap/ldap_ndr.c lib/ldb_compat.c'''
-
CLDAP_SRC = '''libads/cldap.c
../libcli/cldap/cldap.c
../lib/util/idtree.c'''
TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c'''
-SCHANNEL_SRC = '''../libcli/auth/credentials.c
- ../libcli/auth/schannel_sign.c
- ../libcli/auth/schannel_state_tdb.c'''
+SCHANNEL_SRC = '''../libcli/auth/schannel_sign.c'''
LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
libsmb/clikrb5.c libsmb/clispnego.c
@@ -271,8 +260,6 @@ SERVICES_SRC = '''services/svc_spoolss.c
LIB_EVENTLOG_SRC = '''lib/eventlog/eventlog.c'''
-NPA_TSTREAM_SRC = '''../libcli/named_pipe_auth/npa_tstream.c'''
-
RPC_NCACN_NP = '''rpc_server/rpc_ncacn_np.c
rpc_server/rpc_handles.c'''
@@ -467,7 +454,6 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
smbd/smb2_getinfo.c
smbd/smb2_setinfo.c
smbd/smb2_break.c
- ../libcli/smb/smb2_create_blob.c
${MANGLE_SRC}'''
SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
@@ -542,7 +528,7 @@ RPCCLIENT_SRC1 = '''rpcclient/rpcclient.c rpcclient/cmd_lsarpc.c
RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}'''
-PAM_WINBIND_SRC = '../nsswitch/pam_winbind.c ${WBCOMMON_SRC} ${LIBREPLACE_SRC}'
+PAM_WINBIND_SRC = '../nsswitch/pam_winbind.c'
LIBSMBCLIENT_THREAD_SRC = '''libsmb/libsmb_thread_impl.c
libsmb/libsmb_thread_posix.c'''
@@ -605,15 +591,13 @@ LIBNET_SRC = 'libnet/libnet_join.c libnet/libnet_keytab.c'
LIBNET_DSSYNC_SRC = '''libnet/libnet_dssync.c
- libnet/libnet_dssync_keytab.c
- ../libcli/drsuapi/repl_decrypt.c'''
+ libnet/libnet_dssync_keytab.c'''
LIBNET_SAMSYNC_SRC = '''libnet/libnet_samsync.c
libnet/libnet_samsync_ldif.c
libnet/libnet_samsync_passdb.c
libnet/libnet_samsync_display.c
- libnet/libnet_samsync_keytab.c
- ../libcli/samsync/decrypt.c'''
+ libnet/libnet_samsync_keytab.c'''
NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
utils/net_rap.c utils/net_rpc.c utils/net_rpc_samsync.c
@@ -687,8 +671,7 @@ DEBUG2HTML_SRC = '''utils/debug2html.c utils/debugparse.c'''
SMBFILTER_SRC = '''utils/smbfilter.c'''
-WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c ${PARAM_SRC}
- ${LIB_NONSMBD_SRC} ${LIBSMB_ERR_SRC}'''
+WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c'''
WBINFO_SRC = '''../nsswitch/wbinfo.c'''
@@ -795,10 +778,30 @@ bld.SAMBA_LIBRARY('smbsharemodes',
private_library=True,
vars=locals())
+bld.SAMBA_LIBRARY('nss_winbind',
+ source='../nsswitch/winbind_nss_linux.c',
+ deps='WBCOMMON',
+ 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
+ cap wbclient''',
+ realname='libnss_wins.so.2',
+ vnum='2')
+
+if bld.CONFIG_SET('WITH_PAM_MODULES'):
+ bld.SAMBA_LIBRARY('pamwinbind',
+ source=PAM_WINBIND_SRC,
+ deps='intl talloc wbclient WBCOMMON LIBINIPARSER pam',
+ cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
+ realname='pam_winbind.so')
+
bld.SAMBA_SUBSYSTEM('LIBMSRPC',
source='${LIBMSRPC_SRC}',
deps='''ndr NDR_SECURITY NDR_DCERPC NDR_SCHANNEL
- RPCCLI_EPMAPPER''',
+ RPCCLI_EPMAPPER COMMON_SCHANNELDB LIBCLI_AUTH''',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBMSRPC_GEN',
@@ -816,12 +819,6 @@ bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
deps='talloc',
local_include=False)
-bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_MESSAGE',
- source=LIBCLI_LDAP_MESSAGE_SRC)
-
-bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_NDR',
- source=LIBCLI_LDAP_NDR_SRC)
-
bld.SAMBA_SUBSYSTEM('AVAHI',
source=AVAHI_SRC,
deps='avahi-common avahi-client',
@@ -889,7 +886,7 @@ bld.SAMBA_SUBSYSTEM('KRBCLIENT',
bld.SAMBA_SUBSYSTEM('LIBS',
source=LIB_SRC,
- deps='iconv LIBCRYPTO ndr security NDR_SECURITY charset NDR_MESSAGING',
+ deps='LIBCRYPTO ndr security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap samba-util CHARSET',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
@@ -899,12 +896,12 @@ bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
bld.SAMBA_SUBSYSTEM('LIBSMB_ERR',
source=LIBSMB_ERR_SRC,
- deps='SECRETS ldap lber',
+ deps='errors SECRETS ldap lber MSRPC_PARSE LIBCLI_AUTH',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBSAMBA',
source=LIBSAMBA_SRC,
- deps='LIBSMB_ERR NDR_NTLMSSP',
+ deps='LIBSMB_ERR NDR_NTLMSSP ntlm_check',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBSMB',
@@ -969,7 +966,8 @@ bld.SAMBA_SUBSYSTEM('SMBD_BASE',
PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY REGFIO
LIBSMBCONF REG_FULL FNAME_UTIL
LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
- RPCCLI_SRVSVC NPA_TSTREAM INIT_NETLOGON INIT_SAMR
+ RPCCLI_SRVSVC NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON INIT_SAMR
+ LIBCLI_SMB_COMMON
''',
vars=locals())
@@ -1010,12 +1008,12 @@ bld.SAMBA_SUBSYSTEM('LIBNET',
bld.SAMBA_SUBSYSTEM('LIBNET_DSSYNC',
source=LIBNET_DSSYNC_SRC,
- deps='LIBNET',
+ deps='LIBNET LIBCLI_DRSUAPI',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBNET_SAMSYNC',
source=LIBNET_SAMSYNC_SRC,
- deps='LIBNET',
+ deps='LIBNET LIBCLI_SAMSYNC',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBEVENTLOG',
@@ -1057,6 +1055,19 @@ bld.SAMBA_SUBSYSTEM('ndr',
source=LIBNDR_SRC,
vars=locals())
+bld.SAMBA_SUBSYSTEM('tdb-wrap',
+ source='lib/util_tdb.c',
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('CHARSET',
+ source='''lib/util_str.c lib/util_unistr.c lib/charcnv.c lib/iconv.c''',
+ public_deps='iconv',
+ deps='DYNCONFIG')
+
+bld.SAMBA_SUBSYSTEM('samba-util',
+ source=UTIL_SRC,
+ deps='talloc CHARSET LIBCRYPTO',
+ vars=locals())
#FIXME
bld.SAMBA_SUBSYSTEM('ndr-standard',
source='',
@@ -1070,6 +1081,9 @@ bld.SAMBA_SUBSYSTEM('ndr-standard',
#FIXME
bld.SAMBA_SUBSYSTEM('dcerpc', '')
+bld.SAMBA_SUBSYSTEM('ldb',
+ source='lib/ldb_compat.c')
+
bld.SAMBA_SUBSYSTEM('LZXPRESS',
deps='replace',
source='../lib/compression/lzxpress.c')
@@ -1179,10 +1193,6 @@ bld.SAMBA_SUBSYSTEM('RPC_CLIENT_SCHANNEL',
source=RPC_CLIENT_SCHANNEL_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('NPA_TSTREAM',
- source=NPA_TSTREAM_SRC,
- deps='NDR_NAMED_PIPE_AUTH')
-
bld.SAMBA_SUBSYSTEM('INIT_LSA',
source='rpc_client/init_lsa.c')
@@ -1217,7 +1227,7 @@ bld.SAMBA_BINARY('winbindd/winbindd',
LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info
TOKEN_UTIL
LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
- RPCCLI_DSSETUP NPA_TSTREAM INIT_NETLOGON
+ RPCCLI_DSSETUP NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON
RPC_SAMR RPC_LSARPC
''',
enabled=bld.env.build_winbind,
@@ -1501,6 +1511,13 @@ bld.RECURSE('../lib/zlib')
bld.RECURSE('../lib/tsocket')
bld.RECURSE('../lib/iniparser/src')
bld.RECURSE('../lib/crypto')
+bld.RECURSE('../lib/async_req')
+bld.RECURSE('../libcli/auth')
+bld.RECURSE('../libcli/drsuapi')
+bld.RECURSE('../libcli/samsync')
+bld.RECURSE('../libcli/named_pipe_auth')
+bld.RECURSE('../libcli/smb')
+bld.RECURSE('../libcli/ldap')
bld.RECURSE('modules')
bld.RECURSE('auth')
bld.RECURSE('passdb')
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 26e53eb..925b703 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -569,6 +569,7 @@ static bool test_EnumPrinterDrivers_findone(struct torture_context *tctx,
uint32_t count;
union spoolss_DriverInfo *info;
int i;
+ const char *environment_ret = NULL;
torture_assert(tctx,
test_EnumPrinterDrivers_args(tctx, b, server_name, environment, level, &count, &info),
@@ -582,28 +583,37 @@ static bool test_EnumPrinterDrivers_findone(struct torture_context *tctx,
break;
case 2:
driver_name_ret = info[i].info2.driver_name;
+ environment_ret = info[i].info2.architecture;
break;
case 3:
driver_name_ret = info[i].info3.driver_name;
+ environment_ret = info[i].info3.architecture;
break;
case 4:
driver_name_ret = info[i].info4.driver_name;
+ environment_ret = info[i].info4.architecture;
break;
case 5:
driver_name_ret = info[i].info5.driver_name;
+ environment_ret = info[i].info5.architecture;
break;
case 6:
driver_name_ret = info[i].info6.driver_name;
+ environment_ret = info[i].info6.architecture;
break;
case 7:
driver_name_ret = info[i].info7.driver_name;
break;
case 8:
driver_name_ret = info[i].info8.driver_name;
+ environment_ret = info[i].info8.architecture;
break;
default:
break;
}
+ if (environment_ret) {
+ torture_assert_str_equal(tctx, environment, environment_ret, "architecture mismatch");
+ }
if (strequal(driver_name, driver_name_ret)) {
return true;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list