[SCM] Samba Shared Repository - branch v3-6-test updated

Günther Deschner gd at samba.org
Tue Dec 14 17:10:12 MST 2010


The branch, v3-6-test has been updated
       via  d42a900 s3-waf: libwbclient does not depend on talloc anymore.
       via  4ef4527 s3-waf: add missing libnss_wins.so.2 library.
       via  0d5e27e s3-waf: recurse into ../libcli/ldap.
       via  4e1d8de s3-waf: recurse into ../libcli/smb.
       via  9272cec s3-waf: recurse into ../libcli/samsync.
       via  b41f4ee s3-waf: recurse into ../libcli/named_pipe_auth.
       via  8f44a95 s3-waf: recurse into ../libcli/drsuapi.
       via  a26515c s3-waf: add pam_ and nss_winbind.
       via  811637e s3-waf: check for "WITH_PAM_MODULES" to determine pam_smbpass build.
       via  06f3d2d s3-waf: fix pamsmbpass libwbclient dependency.
       via  6ec694b s3-waf: recurse into ../libcli/auth.
       via  725ee70 s3-waf: add CHARSET subsystem.
       via  bf2e387 s3-waf: convert UTIL_SRC into a subsystem samba-util, similar to the s4 one.
       via  431d733 s3-waf: convert lib/util_tdb.c into a subsystem.
       via  1aa6b7b s3-waf: use shared LIBASYNC_REQ subsystem.
       via  799bdfd s4-smbtorture: paranoia check for architectures in request and reply for enumdrivers test.
       via  5277392 s3-waf: try to fix the build with snow leopard.
      from  56b67fd s3-libsmb Improve error message when denying LM encryption

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit d42a9003495ff4021e4c85b64ccea62aa6dd342e
Author: Günther Deschner <gd at samba.org>
Date:   Tue Dec 14 22:54:01 2010 +0100

    s3-waf: libwbclient does not depend on talloc anymore.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Wed Dec 15 00:50:08 CET 2010 on sn-devel-104
    (cherry picked from commit 4bcedda7d8c446bb3864312881aa63b892b55b7e)

commit 4ef45278d8aa93dcb7f049b952997385cc1c9754
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
    (cherry picked from commit 4f4f7694c1a8d973b808f7a6b68fbc04147fcfab)

commit 0d5e27ecf0ad968cca7c6f89ca1ce0f6bbaea82d
Author: Günther Deschner <gd at samba.org>
Date:   Tue Dec 14 22:09:44 2010 +0100

    s3-waf: recurse into ../libcli/ldap.
    
    Guenther
    (cherry picked from commit 9e6736cafd5ea86294b780f32511a1317df94b3f)

commit 4e1d8dee4350528e3ab52a7b747bbe2eef78a406
Author: Günther Deschner <gd at samba.org>
Date:   Tue Dec 14 17:47:46 2010 +0100

    s3-waf: recurse into ../libcli/smb.
    
    Guenther
    (cherry picked from commit 3e6d507246705be877eda61c38868ef29bef6265)

commit 9272cecfb108d7529bae5c1981600a292d380658
Author: Günther Deschner <gd at samba.org>
Date:   Tue Dec 14 17:45:33 2010 +0100

    s3-waf: recurse into ../libcli/samsync.
    
    Guenther
    (cherry picked from commit f2bd9e52b80a1059f4eb22d9aa85097afe939e16)

commit b41f4ee7055124a40ea4b1801b71567bad9b6b8b
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
    (cherry picked from commit baabd56ce94143d6ebf92c8818f53e364152fe19)

commit 8f44a9561dc1b7285a9835963d71fb3ad0b5e44c
Author: Günther Deschner <gd at samba.org>
Date:   Tue Dec 14 17:33:49 2010 +0100

    s3-waf: recurse into ../libcli/drsuapi.
    
    Guenther
    (cherry picked from commit 217ca2a2c9e9914ba02a8cc5477c2b8ea5e5372e)

commit a26515cce158396552155606d46d38210fddfb6b
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
    (cherry picked from commit d860281cd9248b699875a1c4791c7e0cb841da6a)

commit 811637e874a4b68e4a3fa30a641db50f26db1cb8
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
    (cherry picked from commit a13b99323712a3bdd362de06179d0c23dbda0d79)

commit 06f3d2dd6d98d895b8ce797bfcb9dbf1245ac756
Author: Günther Deschner <gd at samba.org>
Date:   Tue Dec 14 17:13:46 2010 +0100

    s3-waf: fix pamsmbpass libwbclient dependency.
    
    Guenther
    (cherry picked from commit 1202e6328bb6009f8fb490c44d13a6930cdd3646)

commit 6ec694b4e83f57623ff5082db098abb533eba474
Author: Günther Deschner <gd at samba.org>
Date:   Tue Dec 14 14:03:22 2010 +0100

    s3-waf: recurse into ../libcli/auth.
    
    Guenther
    (cherry picked from commit 906e489af921a6e66d36aad1778d0cd486ce8287)

commit 725ee7096f96a494e38f69bb89d1737deeb872ea
Author: Günther Deschner <gd at samba.org>
Date:   Tue Dec 14 16:47:35 2010 +0100

    s3-waf: add CHARSET subsystem.
    
    Guenther
    (cherry picked from commit 4c459a926f5e5aade9068497276953bbe3d49a97)

commit bf2e38785616e609926e3aee2ae179126d4eb120
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
    (cherry picked from commit 943f485ef187d66fdc98dcc30b91968b30c3dc5a)

commit 431d7331e6067b5896f5694dc4d6797deb04e7aa
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
    (cherry picked from commit 192838aafdf2e696c33e7443b9e74893309158b2)

commit 1aa6b7b8976a5abe4c7d3a6390ef75e6db253abf
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
    (cherry picked from commit 2407e33c7667fbaabff84edf81c13526a06ebac5)

commit 799bdfd618498fc723131f853c2504d9c0e2cb39
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
    (cherry picked from commit 0990f6342ed3f765c482ddf0baddeac850422352)

commit 5277392d9441baecced0fce98e33d22b8ef310e7
Author: Günther Deschner <gd at samba.org>
Date:   Mon Dec 13 12:56:38 2010 +0100

    s3-waf: try to fix the build with snow leopard.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Mon Dec 13 15:03:08 CET 2010 on sn-devel-104
    (cherry picked from commit a5cfdde558314ea8bd8b9421d0fffd9acbfb7de9)

-----------------------------------------------------------------------

Summary of changes:
 source3/pam_smbpass/wscript_build |    4 +-
 source3/wscript                   |    6 ++-
 source3/wscript_build             |  117 +++++++++++++++++++++----------------
 source4/torture/rpc/spoolss.c     |   10 +++
 4 files changed, 84 insertions(+), 53 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 b/source3/wscript
index e38da59..e7ce72f 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -328,6 +328,10 @@ return acl_get_perm_np(permset_d, perm);
                         'HAVE_ACL_GET_PERM_NP',
                         headers='sys/types.h sys/acl.h', link=True,
                         msg="Checking whether acl_get_perm_np() is available")
+        else:
+            conf.DEFINE('HAVE_NO_ACLS', 1)
+            conf.SET_TARGET_TYPE('acl', 'EMPTY')
+            conf.SET_TARGET_TYPE('attr', 'EMPTY')
     else:
         conf.DEFINE('HAVE_NO_ACLS', 1)
         conf.SET_TARGET_TYPE('acl', 'EMPTY')
@@ -363,7 +367,7 @@ return acl_get_perm_np(permset_d, perm);
         default_static_modules.extend(TO_LIST('rpc_rpcecho pdb_ads'))
         default_shared_modules.extend(TO_LIST('charset_weird perfcount_test'))
 
-    if Options.options.with_acl_support:
+    if Options.options.with_acl_support and conf.CONFIG_SET('HAVE_POSIX_ACLS'):
         default_static_modules.extend(TO_LIST('vfs_posixacl'))
 
     if conf.CONFIG_SET('HAVE_DIRFD_DECL'):
diff --git a/source3/wscript_build b/source3/wscript_build
index 983b670..fbeb33d 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -2,7 +2,7 @@
 
 from samba_utils import *
 
-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
@@ -77,16 +77,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
@@ -94,15 +94,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}
@@ -152,19 +152,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
@@ -174,18 +168,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
@@ -270,8 +259,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'''
 
@@ -466,7 +453,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}
@@ -541,7 +527,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'''
@@ -604,15 +590,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
@@ -686,8 +670,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'''
 
@@ -762,7 +745,7 @@ bld.SAMBA_LIBRARY('wbclient',
                               ../nsswitch/libwbclient/wbc_util.c''',
                     public_headers='../nsswitch/libwbclient/wbclient.h',
                     private_library=True,
-                    public_deps='talloc WBCOMMON')
+                    public_deps='WBCOMMON')
 
 bld.SAMBA_LIBRARY('netapi',
                     source=LIBNETAPI_SRC,
@@ -792,10 +775,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',
@@ -813,12 +816,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',
@@ -886,7 +883,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',
@@ -896,12 +893,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',
@@ -966,7 +963,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())
 
@@ -1007,12 +1005,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',
@@ -1054,6 +1052,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='',
@@ -1067,6 +1078,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')
@@ -1176,10 +1190,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')
 
@@ -1214,7 +1224,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,
@@ -1498,6 +1508,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