[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  8b4b602... python: ntacls, fix a leftover that is not in the try/except branch
       via  00aeca7... dsdb: Add a more explicit error message for constructed attributes
      from  8416570... s4/drs_util: 'net drs showrepl' command implementation

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


- Log -----------------------------------------------------------------
commit 8b4b602e1ac181521442c2bcea7877ee7488fa97
Author: Matthieu Patou <mat at matws.net>
Date:   Fri Feb 19 23:09:57 2010 +0300

    python: ntacls, fix a leftover that is not in the try/except branch
    
    Signed-off-by: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>

commit 00aeca7d7f6a940b208e7549e0d7c88f744f1d63
Author: Matthieu Patou <mat at matws.net>
Date:   Tue Feb 23 16:03:16 2010 +0300

    dsdb: Add a more explicit error message for constructed attributes
    
    Signed-off-by: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>

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

Summary of changes:
 source4/dsdb/samdb/ldb_modules/objectclass.c |    1 +
 source4/scripting/python/samba/ntacls.py     |    1 -
 2 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c b/source4/dsdb/samdb/ldb_modules/objectclass.c
index 475b53a..8bcac11 100644
--- a/source4/dsdb/samdb/ldb_modules/objectclass.c
+++ b/source4/dsdb/samdb/ldb_modules/objectclass.c
@@ -364,6 +364,7 @@ static int fix_check_attributes(struct ldb_context *ldb,
 
 			/* We have to deny write operations on constructed attributes */
 			if ((attribute->systemFlags & DS_FLAG_ATTR_IS_CONSTRUCTED) != 0) {
+				ldb_asprintf_errstring(ldb, "attribute %s is constructed", msg->elements[i].name);
 				if (op == LDB_ADD) {
 					return LDB_ERR_UNDEFINED_ATTRIBUTE_TYPE;
 				} else {
diff --git a/source4/scripting/python/samba/ntacls.py b/source4/scripting/python/samba/ntacls.py
index 15f310b..66af5d5 100644
--- a/source4/scripting/python/samba/ntacls.py
+++ b/source4/scripting/python/samba/ntacls.py
@@ -45,7 +45,6 @@ def getntacl(lp,file,backend=None,eadbfile=None):
 		raise
 	eadbname = lp.get("posix:eadb")
 	if eadbname != None and eadbname != "" :
-		attribute = samba.xattr_tdb.wrap_getxattr(eadbname,file,xattr.XATTR_NTACL_NAME)
 		try:
 			attribute = samba.xattr_tdb.wrap_getxattr(eadbname,file,xattr.XATTR_NTACL_NAME)
 		except:


-- 
Samba Shared Repository