[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  4ded55e s4-python: Ensure we handle the no-eadb case for system xattrs in get/setntacl
       via  f1f00e5 Added number of FSMO roles owned by the server we are trying to demote.
       via  0615cf5 s4-provision: Always give the warning if we are using eadb.  It really should be for testing only
      from  e58f03c s3: Fix the build on FreeBSD

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


- Log -----------------------------------------------------------------
commit 4ded55ebcd4ae3e0425d7e89e30b24d72682c0de
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Apr 19 22:45:48 2012 +1000

    s4-python: Ensure we handle the no-eadb case for system xattrs in get/setntacl
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Thu Apr 19 20:51:16 CEST 2012 on sn-devel-104

commit f1f00e5ba0b52bafac8532fba19112ebbed06738
Author: Daniele Dario <d.dario76 at gmail.com>
Date:   Thu Apr 19 12:13:41 2012 +0200

    Added number of FSMO roles owned by the server we are trying to demote.

commit 0615cf5f85ba2a4946a583c060af78fbe3e8cb4c
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Apr 19 22:31:29 2012 +1000

    s4-provision: Always give the warning if we are using eadb.  It really should be for testing only

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

Summary of changes:
 source4/scripting/python/samba/netcmd/domain.py |    2 +-
 source4/scripting/python/samba/ntacls.py        |    1 +
 source4/setup/provision                         |    9 ++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py
index 2d8bfe3..2ce0535 100644
--- a/source4/scripting/python/samba/netcmd/domain.py
+++ b/source4/scripting/python/samba/netcmd/domain.py
@@ -249,7 +249,7 @@ class cmd_domain_demote(Command):
                             controls=["search_options:1:2"])
 
         if len(res) != 0:
-            raise CommandError("Current DC is still the owner of %d role(s), use the role command to transfer roles to another DC")
+            raise CommandError("Current DC is still the owner of %d role(s), use the role command to transfer roles to another DC" % len(res))
 
         print "Using %s as partner server for the demotion" % server
         (drsuapiBind, drsuapi_handle, supportedExtensions) = drsuapi_connect(server, lp, creds)
diff --git a/source4/scripting/python/samba/ntacls.py b/source4/scripting/python/samba/ntacls.py
index 51d6de5..e3d24fa 100644
--- a/source4/scripting/python/samba/ntacls.py
+++ b/source4/scripting/python/samba/ntacls.py
@@ -37,6 +37,7 @@ def checkset_backend(lp, backend, eadbfile):
         posix_eadb = lp.get("posix:eadb")
         if posix_eadb is not None:
             return (samba.posix_eadb, lp.get("posix:eadb"))
+        return (None, None)
     elif backend == "native":
         return (None, None)
     elif backend == "eadb":
diff --git a/source4/setup/provision b/source4/setup/provision
index f254fa7..a0e58ec 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -221,6 +221,7 @@ if opts.targetdir is not None:
         os.mkdir(opts.targetdir)
 
 eadb = True
+
 if opts.use_xattrs == "yes":
     eadb = False
 elif opts.use_xattrs == "auto" and not lp.get("posix:eadb"):
@@ -231,14 +232,16 @@ elif opts.use_xattrs == "auto" and not lp.get("posix:eadb"):
     try:
         try:
             samba.ntacls.setntacl(lp, file.name,
-                "O:S-1-5-32G:S-1-5-32", "S-1-5-32", "native")
+                                  "O:S-1-5-32G:S-1-5-32", "S-1-5-32", "native")
             eadb = False
         except Exception:
-            logger.info("You are not root or your system do not support xattr, using tdb backend for attributes. "
-                    "If you intend to use this provision in production, rerun the script as root on a system supporting xattrs.")
+            logger.info("You are not root or your system do not support xattr, using tdb backend for attributes. ")
     finally:
         file.close()
 
+if eadb:
+    logger.info("not using extended attributes to store ACLs and other metadata. If you intend to use this provision in production, rerun the script as root on a system supporting xattrs.")
+
 session = system_session()
 try:
     result = provision(logger,


-- 
Samba Shared Repository