[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Mon Aug 1 11:00:02 MDT 2011
The branch, master has been updated
via 7585057 acl: Improve error message when setting acls fails.
via cdc146d remove unnecessary dependency on 'events' from ldb modules.
via 56e86ed heimdal_build: Use krb5-config to find heimdal include directory and library path, rather than hardcoding.
from 695af0f winsif.idl: fix comment about a pidl bug
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7585057a22beda5bac2b98c7488e994880927daf
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Jul 31 20:05:23 2011 +0200
acl: Improve error message when setting acls fails.
Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date: Mon Aug 1 18:59:12 CEST 2011 on sn-devel-104
commit cdc146d0c4969e693dd172a0fe7b40ac95bb9e0f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Jul 31 19:42:15 2011 +0200
remove unnecessary dependency on 'events' from ldb modules.
commit 56e86ed52d5e0567b79049ec0d52b9e15b34fec7
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Jul 30 17:45:04 2011 +0200
heimdal_build: Use krb5-config to find heimdal include directory and library path, rather than hardcoding.
-----------------------------------------------------------------------
Summary of changes:
source4/dsdb/samdb/ldb_modules/wscript_build | 70 +++++++++++-----------
source4/heimdal_build/wscript_configure | 21 ++++++-
source4/scripting/python/samba/upgradehelpers.py | 16 ++++-
3 files changed, 66 insertions(+), 41 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index eb9c664..56c2d12 100644
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -29,7 +29,7 @@ bld.SAMBA_MODULE('ldb_samba_dsdb',
subsystem='ldb',
init_function='ldb_samba_dsdb_module_init',
module_init_name='ldb_init_module',
- deps='samdb talloc events ndr DSDB_MODULE_HELPERS',
+ deps='samdb talloc ndr DSDB_MODULE_HELPERS',
internal_module=False,
)
@@ -40,7 +40,7 @@ bld.SAMBA_MODULE('ldb_samba_secrets',
init_function='ldb_samba_secrets_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='samdb talloc events ndr'
+ deps='samdb talloc ndr'
)
@@ -50,7 +50,7 @@ bld.SAMBA_MODULE('ldb_objectguid',
init_function='ldb_objectguid_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='samdb talloc events ndr DSDB_MODULE_HELPERS'
+ deps='samdb talloc ndr DSDB_MODULE_HELPERS'
)
@@ -60,7 +60,7 @@ bld.SAMBA_MODULE('ldb_repl_meta_data',
init_function='ldb_repl_meta_data_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='samdb talloc events ndr NDR_DRSUAPI NDR_DRSBLOBS ndr DSDB_MODULE_HELPERS security'
+ deps='samdb talloc ndr NDR_DRSUAPI NDR_DRSBLOBS ndr DSDB_MODULE_HELPERS security'
)
@@ -70,7 +70,7 @@ bld.SAMBA_MODULE('ldb_schema_load',
init_function='ldb_schema_load_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='samdb talloc events DSDB_MODULE_HELPERS'
+ deps='samdb talloc DSDB_MODULE_HELPERS'
)
@@ -80,7 +80,7 @@ bld.SAMBA_MODULE('ldb_schema_data',
init_function='ldb_schema_data_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='samdb talloc events DSDB_MODULE_HELPERS'
+ deps='samdb talloc DSDB_MODULE_HELPERS'
)
@@ -90,7 +90,7 @@ bld.SAMBA_MODULE('ldb_naming_fsmo',
init_function='ldb_naming_fsmo_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='samdb talloc events DSDB_MODULE_HELPERS'
+ deps='samdb talloc DSDB_MODULE_HELPERS'
)
@@ -100,7 +100,7 @@ bld.SAMBA_MODULE('ldb_pdc_fsmo',
init_function='ldb_pdc_fsmo_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='samdb talloc events DSDB_MODULE_HELPERS'
+ deps='samdb talloc DSDB_MODULE_HELPERS'
)
@@ -110,7 +110,7 @@ bld.SAMBA_MODULE('ldb_samldb',
init_function='ldb_samldb_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events samdb DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_RIDALLOC'
+ deps='talloc samdb DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_RIDALLOC'
)
@@ -120,7 +120,7 @@ bld.SAMBA_MODULE('ldb_samba3sam',
init_function='ldb_samba3sam_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events ldb smbpasswdparser security NDR_SECURITY'
+ deps='talloc ldb smbpasswdparser security NDR_SECURITY'
)
@@ -130,7 +130,7 @@ bld.SAMBA_MODULE('ldb_samba3sid',
init_function='ldb_samba3sid_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events ldb security NDR_SECURITY ldbsamba DSDB_MODULE_HELPERS'
+ deps='talloc ldb security NDR_SECURITY ldbsamba DSDB_MODULE_HELPERS'
)
@@ -140,7 +140,7 @@ bld.SAMBA_MODULE('ldb_simple_ldap_map',
init_function='ldb_simple_ldap_map_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events ldb ndr ldbsamba'
+ deps='talloc ldb ndr ldbsamba'
)
@@ -150,7 +150,7 @@ bld.SAMBA_MODULE('ldb_rootdse',
init_function='ldb_rootdse_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events samdb MESSAGING security DSDB_MODULE_HELPERS'
+ deps='talloc samdb MESSAGING security DSDB_MODULE_HELPERS'
)
@@ -160,7 +160,7 @@ bld.SAMBA_MODULE('ldb_password_hash',
init_function='ldb_password_hash_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events samdb LIBCLI_AUTH NDR_DRSBLOBS authkrb5 krb5 DSDB_MODULE_HELPERS'
+ deps='talloc samdb LIBCLI_AUTH NDR_DRSBLOBS authkrb5 krb5 DSDB_MODULE_HELPERS'
)
@@ -170,7 +170,7 @@ bld.SAMBA_MODULE('ldb_local_password',
init_function='ldb_local_password_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events ndr samdb'
+ deps='talloc ndr samdb'
)
bld.SAMBA_MODULE('ldb_extended_dn_in',
@@ -179,7 +179,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_in',
init_function='ldb_extended_dn_in_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='ldb talloc events samba-util'
+ deps='ldb talloc samba-util'
)
@@ -188,7 +188,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_out',
init_function='ldb_extended_dn_out_module_init',
module_init_name='ldb_init_module',
subsystem='ldb',
- deps='talloc events ndr samba-util samdb',
+ deps='talloc ndr samba-util samdb',
internal_module=False,
)
@@ -199,7 +199,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_store',
init_function='ldb_extended_dn_store_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events samba-util samdb DSDB_MODULE_HELPERS'
+ deps='talloc samba-util samdb DSDB_MODULE_HELPERS'
)
@@ -209,7 +209,7 @@ bld.SAMBA_MODULE('ldb_show_deleted',
init_function='ldb_show_deleted_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events samba-util DSDB_MODULE_HELPERS'
+ deps='talloc samba-util DSDB_MODULE_HELPERS'
)
@@ -220,7 +220,7 @@ bld.SAMBA_MODULE('ldb_partition',
init_function='ldb_partition_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events samdb DSDB_MODULE_HELPERS'
+ deps='talloc samdb DSDB_MODULE_HELPERS'
)
@@ -230,7 +230,7 @@ bld.SAMBA_MODULE('ldb_new_partition',
init_function='ldb_new_partition_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events samdb DSDB_MODULE_HELPERS'
+ deps='talloc samdb DSDB_MODULE_HELPERS'
)
@@ -240,7 +240,7 @@ bld.SAMBA_MODULE('ldb_update_keytab',
init_function='ldb_update_keytab_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events credentials ldb com_err KERBEROS_UTIL DSDB_MODULE_HELPERS'
+ deps='talloc credentials ldb com_err KERBEROS_UTIL DSDB_MODULE_HELPERS'
)
@@ -250,7 +250,7 @@ bld.SAMBA_MODULE('ldb_objectclass',
init_function='ldb_objectclass_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events security NDR_SECURITY samdb DSDB_MODULE_HELPERS samba-util DSDB_MODULE_HELPER_SCHEMA'
+ deps='talloc security NDR_SECURITY samdb DSDB_MODULE_HELPERS samba-util DSDB_MODULE_HELPER_SCHEMA'
)
@@ -270,7 +270,7 @@ bld.SAMBA_MODULE('ldb_subtree_rename',
init_function='ldb_subtree_rename_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events samba-util ldb samdb-common'
+ deps='talloc samba-util ldb samdb-common'
)
@@ -280,7 +280,7 @@ bld.SAMBA_MODULE('ldb_subtree_delete',
init_function='ldb_subtree_delete_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events samba-util DSDB_MODULE_HELPERS'
+ deps='talloc samba-util DSDB_MODULE_HELPERS'
)
@@ -290,7 +290,7 @@ bld.SAMBA_MODULE('ldb_linked_attributes',
init_function='ldb_linked_attributes_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events samdb DSDB_MODULE_HELPERS'
+ deps='talloc samdb DSDB_MODULE_HELPERS'
)
@@ -300,7 +300,7 @@ bld.SAMBA_MODULE('ldb_ranged_results',
init_function='ldb_ranged_results_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events samba-util ldb'
+ deps='talloc samba-util ldb'
)
@@ -310,7 +310,7 @@ bld.SAMBA_MODULE('ldb_anr',
init_function='ldb_anr_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events samba-util samdb'
+ deps='talloc samba-util samdb'
)
@@ -320,7 +320,7 @@ bld.SAMBA_MODULE('ldb_instancetype',
init_function='ldb_instancetype_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events samba-util samdb DSDB_MODULE_HELPERS'
+ deps='talloc samba-util samdb DSDB_MODULE_HELPERS'
)
@@ -330,7 +330,7 @@ bld.SAMBA_MODULE('ldb_operational',
init_function='ldb_operational_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc tevent samba-util samdb-common DSDB_MODULE_HELPERS samdb'
+ deps='talloc samba-util samdb-common DSDB_MODULE_HELPERS samdb'
)
@@ -340,7 +340,7 @@ bld.SAMBA_MODULE('ldb_descriptor',
init_function='ldb_descriptor_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events security NDR_SECURITY samdb DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA'
+ deps='talloc security NDR_SECURITY samdb DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA'
)
@@ -350,7 +350,7 @@ bld.SAMBA_MODULE('ldb_resolve_oids',
init_function='ldb_resolve_oids_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='samdb talloc events ndr'
+ deps='samdb talloc ndr'
)
@@ -360,7 +360,7 @@ bld.SAMBA_MODULE('ldb_acl',
init_function='ldb_acl_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events security samdb DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA'
+ deps='talloc security samdb DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA'
)
@@ -379,7 +379,7 @@ bld.SAMBA_MODULE('ldb_aclread',
init_function='ldb_aclread_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events security samdb DSDB_MODULE_HELPERS',
+ deps='talloc security samdb DSDB_MODULE_HELPERS',
)
bld.SAMBA_MODULE('ldb_simple_dn',
@@ -397,5 +397,5 @@ bld.SAMBA_MODULE('ldb_dirsync',
init_function='ldb_dirsync_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events security samdb DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA'
+ deps='talloc security samdb DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA'
)
diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
index c4bd56f..a15070c 100644
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -152,6 +152,23 @@ conf.define('HAVE_ENCTYPE_ARCFOUR_HMAC_MD5', 1)
conf.define('HAVE_ENCTYPE_ARCFOUR_HMAC', 1)
conf.define('HAVE_KRB5_PDU_NONE_DECL', 1)
+heimdal_includedirs = []
+heimdal_libdirs = []
+krb5_config = conf.find_program("krb5-config.heimdal", var="HEIMDAL_KRB5_CONFIG")
+if not krb5_config:
+ krb5_config = conf.find_program("krb5-config", var="HEIMDAL_KRB5_CONFIG")
+if krb5_config:
+ # Not ideal, but seems like the best way to get at these paths:
+ f = open(krb5_config, 'r')
+ try:
+ for l in f:
+ if l.startswith("libdir="):
+ heimdal_libdirs.append(l.strip()[len("libdir="):])
+ elif l.startswith("includedir="):
+ heimdal_includedirs.append(l.strip()[len("includedir="):])
+ finally:
+ f.close()
+
if conf.CHECK_BUNDLED_SYSTEM('com_err', checkfunctions='com_right_r com_err', headers='com_err.h'):
conf.define('USING_SYSTEM_COM_ERR', 1)
@@ -160,8 +177,8 @@ def check_system_heimdal_lib(name, functions='', headers='', onlyif=None):
# used.
if conf.LIB_MAY_BE_BUNDLED(name):
return False
- setattr(conf.env, "CPPPATH_%s" % name.upper(), ["/usr/include/heimdal"])
- setattr(conf.env, "LIBPATH_%s" % name.upper(), ["/usr/lib/heimdal"])
+ setattr(conf.env, "CPPPATH_%s" % name.upper(), heimdal_includedirs)
+ setattr(conf.env, "LIBPATH_%s" % name.upper(), heimdal_libdirs)
conf.CHECK_BUNDLED_SYSTEM(name, checkfunctions=functions, headers=headers,
onlyif=onlyif)
conf.define('USING_SYSTEM_%s' % name.upper(), 1)
diff --git a/source4/scripting/python/samba/upgradehelpers.py b/source4/scripting/python/samba/upgradehelpers.py
index 1ee1c04..9034140 100755
--- a/source4/scripting/python/samba/upgradehelpers.py
+++ b/source4/scripting/python/samba/upgradehelpers.py
@@ -609,22 +609,30 @@ def update_gpo(paths, samdb, names, lp, message, force=0):
dir = getpolicypath(paths.sysvol, names.dnsdomain, names.policyid_dc)
if not os.path.isdir(dir):
create_gpo_struct(dir)
+
+ def acl_error(e):
+ if os.geteuid() == 0:
+ message(ERROR, "Unable to set ACLs on policies related objects: %s" % e)
+ else:
+ message(ERROR, "Unable to set ACLs on policies related objects. "
+ "ACLs must be set as root if file system ACLs "
+ "(rather than posix:eadb) are used.")
+
# We always reinforce acls on GPO folder because they have to be in sync
# with the one in DS
try:
set_gpos_acl(paths.sysvol, names.dnsdomain, names.domainsid,
names.domaindn, samdb, lp)
except TypeError, e:
- message(ERROR, "Unable to set ACLs on policies related objects,"
- " if not using posix:eadb, you must be root to do it")
+ acl_error(e)
if resetacls:
try:
setsysvolacl(samdb, paths.netlogon, paths.sysvol, names.wheel_gid,
names.domainsid, names.dnsdomain, names.domaindn, lp)
except TypeError, e:
- message(ERROR, "Unable to set ACLs on sysvol share, if not using"
- "posix:eadb, you must be root to do it")
+ acl_error(e)
+
def increment_calculated_keyversion_number(samdb, rootdn, hashDns):
"""For a given hash associating dn and a number, this function will
--
Samba Shared Repository
More information about the samba-cvs
mailing list