[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Mon Oct 18 08:40:01 MDT 2010


The branch, master has been updated
       via  64e9f79 s3: fix the build of idmap_adex, idmap_tdb2, idmap_hash and several vfs modules.
       via  5845dae s3-waf: fix the build after libcli/security changes.
       via  203dc4f s3-waf: fix the build of smbtorture.
       via  10f95a4 s3-waf: fix pdb modules build.
      from  20c7e2b s4:libcli/util: add pipe related NT_STATUS_RPC_* codes

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 64e9f79587916c0e8e9079636e3a2ab60ea2b455
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 18 15:55:47 2010 +0200

    s3: fix the build of idmap_adex, idmap_tdb2, idmap_hash and several vfs modules.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Mon Oct 18 14:39:39 UTC 2010 on sn-devel-104

commit 5845dae8262a648d3af7b73044483e8bed2f4f08
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 18 15:55:16 2010 +0200

    s3-waf: fix the build after libcli/security changes.
    
    Guenther

commit 203dc4f929640ad704b96efc043daa2d97556af3
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 12 00:46:53 2010 +0200

    s3-waf: fix the build of smbtorture.
    
    Guenther

commit 10f95a4f1a5f08c5b58b5f5d10921d792997c352
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 12 00:26:03 2010 +0200

    s3-waf: fix pdb modules build.
    
    Guenther

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

Summary of changes:
 librpc/wscript_build                           |    2 +-
 source3/modules/nfs4_acls.c                    |    1 +
 source3/passdb/wscript_build                   |   27 ++++++++++-----------
 source3/winbindd/idmap_adex/likewise_cell.c    |    1 +
 source3/winbindd/idmap_adex/provider_unified.c |    1 +
 source3/winbindd/idmap_hash/idmap_hash.c       |    1 +
 source3/winbindd/idmap_tdb2.c                  |    1 +
 source3/wscript_build                          |   29 +++++++++++++----------
 8 files changed, 35 insertions(+), 28 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/wscript_build b/librpc/wscript_build
index 0e6c8c0..631bb83 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -298,7 +298,7 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_AUDIOSRV',
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_ECHO',
 	source='../librpc/gen_ndr/ndr_echo_c.c',
-	public_deps='dcerpc NDR_STANDARD'
+	public_deps='dcerpc NDR_ECHO'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_DSBACKUP',
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 7e5f994..1913946 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -21,6 +21,7 @@
 #include "nfs4_acls.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 #include "include/dbwrap.h"
 
 #undef DBGC_CLASS
diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build
index d4a6f57..665b759 100644
--- a/source3/passdb/wscript_build
+++ b/source3/passdb/wscript_build
@@ -1,48 +1,47 @@
 #!/usr/bin/env python
 
-PDB_STATIC =        ''
 PDB_TDBSAM_SRC =    'pdb_tdb.c'
 PDB_LDAP_SRC =      'pdb_ldap.c pdb_nds.c'
 PDB_ADS_SRC =       'pdb_ads.c'
 PDB_SMBPASSWD_SRC = 'pdb_smbpasswd.c'
 PDB_WBC_SAM_SRC =   'pdb_wbc_sam.c'
 
-bld.SAMBA_SUBSYSTEM('PDB',
-                    source='',
-                    deps='''PDB_TDBSAM PDB_LDAP PDB_ADS PDB_SMBPASSWD PDB_WBC_SAM''',
+bld.SAMBA_SUBSYSTEM('pdb',
+                    source='pdb_interface.c',
+                    deps='',
                     vars=locals())
 
-bld.SAMBA_MODULE('PDB_TDBSAM',
-                 subsystem='PDB',
+bld.SAMBA_MODULE('pdb_tdbsam',
+                 subsystem='pdb',
                  source=PDB_TDBSAM_SRC,
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('PDB_TDBSAM'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('PDB_TDBSAM'))
 
-bld.SAMBA_MODULE('PDB_LDAP',
-                 subsystem='PDB',
+bld.SAMBA_MODULE('pdb_ldap',
+                 subsystem='pdb',
                  source=PDB_LDAP_SRC,
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('PDB_LDAP'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('PDB_LDAP'))
 
-bld.SAMBA_MODULE('PDB_ADS',
-                 subsystem='PDB',
+bld.SAMBA_MODULE('pdb_ads',
+                 subsystem='pdb',
                  source=PDB_ADS_SRC,
                  deps='LIBCLI_LDAP_NDR',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('PDB_ADS'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('PDB_ADS'))
 
-bld.SAMBA_MODULE('PDB_SMBPASSWD',
-                 subsystem='PDB',
+bld.SAMBA_MODULE('pdb_smbpasswd',
+                 subsystem='pdb',
                  source=PDB_SMBPASSWD_SRC,
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('PDB_SMBPASSWD'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('PDB_SMBPASSWD'))
 
-bld.SAMBA_MODULE('PDB_WBC_SAM',
-                 subsystem='PDB',
+bld.SAMBA_MODULE('pdb_wbc_sam',
+                 subsystem='pdb',
                  source=PDB_WBC_SAM_SRC,
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('PDB_WBC_SAM'),
diff --git a/source3/winbindd/idmap_adex/likewise_cell.c b/source3/winbindd/idmap_adex/likewise_cell.c
index 00ccc59..0914132 100644
--- a/source3/winbindd/idmap_adex/likewise_cell.c
+++ b/source3/winbindd/idmap_adex/likewise_cell.c
@@ -23,6 +23,7 @@
 #include "idmap.h"
 #include "idmap_adex.h"
 #include "secrets.h"
+#include "../libcli/security/dom_sid.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP
diff --git a/source3/winbindd/idmap_adex/provider_unified.c b/source3/winbindd/idmap_adex/provider_unified.c
index 9f5cc88..b61666f 100644
--- a/source3/winbindd/idmap_adex/provider_unified.c
+++ b/source3/winbindd/idmap_adex/provider_unified.c
@@ -25,6 +25,7 @@
 #include "idmap.h"
 #include "idmap_adex.h"
 #include "../libcli/ldap/ldap_ndr.h"
+#include "../libcli/security/dom_sid.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP
diff --git a/source3/winbindd/idmap_hash/idmap_hash.c b/source3/winbindd/idmap_hash/idmap_hash.c
index f6c8652..08e283c 100644
--- a/source3/winbindd/idmap_hash/idmap_hash.c
+++ b/source3/winbindd/idmap_hash/idmap_hash.c
@@ -24,6 +24,7 @@
 #include "idmap_hash.h"
 #include "ads.h"
 #include "nss_info.h"
+#include "../libcli/security/dom_sid.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP
diff --git a/source3/winbindd/idmap_tdb2.c b/source3/winbindd/idmap_tdb2.c
index 0613fdb..a78a41e 100644
--- a/source3/winbindd/idmap_tdb2.c
+++ b/source3/winbindd/idmap_tdb2.c
@@ -36,6 +36,7 @@
 #include "idmap.h"
 #include "idmap_rw.h"
 #include "dbwrap.h"
+#include "../libcli/security/dom_sid.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP
diff --git a/source3/wscript_build b/source3/wscript_build
index dce16e3..168edb3 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -84,10 +84,6 @@ LIBCLI_DFS_SRC = '''
                  ../librpc/gen_ndr/cli_dfs.c
                  ../librpc/gen_ndr/ndr_dfs_c.c'''
 
-LIBCLI_ECHO_SRC = '''
-                  ../librpc/gen_ndr/cli_echo.c
-                  ../librpc/gen_ndr/ndr_echo_c.c'''
-
 LIBCLI_INITSHUTDOWN_SRC = '''
                           ../librpc/gen_ndr/cli_initshutdown.c
                           ../librpc/gen_ndr/ndr_initshutdown_c.c'''
@@ -131,7 +127,6 @@ LIBCLI_EPMAPPER_SRC = '''
 LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c
                  ${LIBNDR_GEN_SRC0}
                  ../librpc/gen_ndr/ndr_dfs.c
-                 ../librpc/gen_ndr/ndr_echo.c
                  ../librpc/gen_ndr/ndr_winreg.c
                  ../librpc/gen_ndr/ndr_initshutdown.c
                  ../librpc/gen_ndr/ndr_srvsvc.c
@@ -200,13 +195,16 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC}
           lib/module.c lib/events.c ${LIBTEVENT_SRC0}
           lib/server_contexts.c
           lib/ldap_escape.c
-          lib/secdesc.c lib/util_seaccess.c ../libcli/security/secace.c
+          lib/secdesc.c ../libcli/security/access_check.c
+          ../libcli/security/secace.c
+          ../libcli/security/object_tree.c
           ../libcli/security/sddl.c
           ../libcli/security/secacl.c ${PTHREADPOOL_SRC}
           lib/fncall.c
           libads/krb5_errs.c lib/system_smbd.c lib/audit.c
           lib/file_id.c lib/idmap_cache.c
-          ../libcli/security/dom_sid.c ../libcli/security/security_descriptor.c'''
+          ../libcli/security/dom_sid.c ../libcli/security/security_descriptor.c
+          ../libcli/security/security_token.c ../libcli/security/util_sid.c'''
 
 LIB_DUMMY_SRC = '''lib/dummysmbd.c lib/dummyroot.c'''
 LIB_NONSMBD_SRC = '''${LIB_DUMMY_SRC}'''
@@ -451,7 +449,7 @@ PRIVILEGES_SRC = '''lib/privileges.c'''
 
 PASSDB_GET_SET_SRC = '''passdb/pdb_get_set.c'''
 
-PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c passdb/pdb_interface.c
+PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c
                 passdb/util_wellknown.c passdb/util_builtin.c passdb/pdb_compat.c
                 passdb/util_unixsids.c passdb/lookup_sid.c
                 passdb/login_cache.c
@@ -726,7 +724,6 @@ RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}
                    ${LIBCLI_NTSVCS_SRC}
                    ${LIBCLI_DRSUAPI_SRC}
                    ${LIBCLI_DFS_SRC}
-                   ${LIBCLI_ECHO_SRC}
                    ${LIBCLI_DSSETUP_SRC}
                    ${LIBCLI_WKSSVC_SRC}
                    ${LIBCLI_SRVSVC_SRC}
@@ -872,6 +869,7 @@ NMBLOOKUP_SRC = '''utils/nmblookup.c ${LIBNMB_SRC}'''
 SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/utable.c
                 torture/denytest.c torture/mangle_test.c
                 torture/nbench.c
+                torture/test_async_echo.c
                 torture/test_posix_append.c'''
 
 SMBTORTURE_SRC = '''${SMBTORTURE_SRC1} ${TLDAP_SRC}
@@ -1053,7 +1051,8 @@ bld.SAMBA_SUBSYSTEM('LIBMSRPC',
 
 bld.SAMBA_SUBSYSTEM('LIBMSRPC_GEN',
                     source='${LIBNDR_GEN_SRC}',
-                    deps='LIBNDR NDR_SECURITY NDR_DCERPC NDR_EVENTLOG NDR_LSA',
+                    deps='''LIBNDR NDR_SECURITY NDR_DCERPC NDR_EVENTLOG NDR_LSA
+                    NDR_ECHO''',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBGPO',
@@ -1086,7 +1085,7 @@ bld.SAMBA_SUBSYSTEM('TLDAP',
 
 bld.SAMBA_SUBSYSTEM('PASSDB',
                     source=PASSDB_SRC,
-                    deps='''GROUPDB TLDAP SECRETS SMBLDAP PDB''',
+                    deps='''GROUPDB TLDAP SECRETS SMBLDAP pdb''',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('PARAM_WITHOUT_REG',
@@ -1305,6 +1304,10 @@ bld.SAMBA_SUBSYSTEM('RPCCLI_WINREG',
                     source='../librpc/gen_ndr/cli_winreg.c',
                     public_deps='RPC_NDR_WINREG')
 
+bld.SAMBA_SUBSYSTEM('RPCCLI_ECHO',
+                    source='../librpc/gen_ndr/cli_echo.c',
+                    public_deps='RPC_NDR_ECHO')
+
 ########################## BINARIES #################################
 
 bld.SAMBA_BINARY('smbd/smbd',
@@ -1346,7 +1349,7 @@ 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 SMBREADLINE DISPLAY_SEC DCUTIL RPCCLI_WINREG''',
+                 LIBADS SMBREADLINE DISPLAY_SEC DCUTIL RPCCLI_WINREG RPCCLI_ECHO''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbclient',
@@ -1432,7 +1435,7 @@ bld.SAMBA_BINARY('nmblookup',
 bld.SAMBA_BINARY('smbtorture',
                  source=SMBTORTURE_SRC,
                  deps='''talloc tdb tevent cap resolv libwbclient PARAM LIBSMB KRBCLIENT
-                 LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''',
+                 LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_LSA LIBMSRPC LIBMSRPC_GEN RPCCLI_ECHO''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbconftort',


-- 
Samba Shared Repository


More information about the samba-cvs mailing list