[SCM] Samba Shared Repository - branch v4-1-test updated

Karolin Seeger kseeger at samba.org
Wed Sep 25 10:48:06 CEST 2013

The branch, v4-1-test has been updated
       via  4182c97 python-samba-tool fsmo: Do not give an error on a successful role transfer
      from  7f066b2 Fix bug 10162 - POSIX ACL mapping failing when setting DENY ACE's from Windows.


- Log -----------------------------------------------------------------
commit 4182c97041ff3668d6894b32ee1b0549ccb9890e
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu May 9 15:16:55 2013 +1200

    python-samba-tool fsmo: Do not give an error on a successful role transfer
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=9461
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Mon Sep 23 12:00:24 CEST 2013 on sn-devel-104
    (cherry picked from commit 8d8872ae0a19786452c3be044757b16814b82be8)
    Autobuild-User(v4-1-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-1-test): Wed Sep 25 10:47:35 CEST 2013 on sn-devel-104


Summary of changes:
 python/samba/netcmd/fsmo.py |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

Changeset truncated at 500 lines:

diff --git a/python/samba/netcmd/fsmo.py b/python/samba/netcmd/fsmo.py
index c938c91..02721f9 100644
--- a/python/samba/netcmd/fsmo.py
+++ b/python/samba/netcmd/fsmo.py
@@ -124,22 +124,22 @@ all=all of the above"""),
             self.message("Attempting transfer...")
                 transfer_role(self.outf, role, samdb)
+                self.outf.write("FSMO seize was not required, as transfer of '%s' role was successful\n" % role)
+                return
             except CommandError:
             #transfer failed, use the big axe...
                 self.message("Transfer unsuccessful, seizing...")
-                m["fSMORoleOwner"]= ldb.MessageElement(
-                    serviceName, ldb.FLAG_MOD_REPLACE,
-                    "fSMORoleOwner")
             self.message("Will not attempt transfer, seizing...")
-            m["fSMORoleOwner"]= ldb.MessageElement(
-                serviceName, ldb.FLAG_MOD_REPLACE,
-                "fSMORoleOwner")
+        m["fSMORoleOwner"]= ldb.MessageElement(
+            serviceName, ldb.FLAG_MOD_REPLACE,
+            "fSMORoleOwner")
         except LdbError, (num, msg):
             raise CommandError("Failed to initiate role seize of '%s' role: %s" % (role, msg))
-        self.outf.write("FSMO transfer of '%s' role successful\n" % role)
+        self.outf.write("FSMO seize of '%s' role successful\n" % role)
     def run(self, force=None, H=None, role=None,
             credopts=None, sambaopts=None, versionopts=None):

Samba Shared Repository

More information about the samba-cvs mailing list