Attachment 9238 Details for Bug 9461 – Patches for v4-0-test

[patch] Patches for v4-0-test

tmp40.diff (text/plain), 2.24 KB, created by Stefan Metzmacher on 2013-09-23 17:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2013-09-23 17:50:01 UTC

Size: 2.24 KB

patch

obsolete

>From 30fb47ccb6a423cc70adf8b6753871194a109490 Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Thu, 9 May 2013 15:16:55 +1200
>Subject: [PATCH] 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@samba.org>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>
>Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
>Autobuild-Date(master): Mon Sep 23 12:00:24 CEST 2013 on sn-devel-104
>(cherry picked from commit 8d8872ae0a19786452c3be044757b16814b82be8)
>---
> python/samba/netcmd/fsmo.py |   14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
>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...")
>             try:
>                 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")
>         else:
>             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")
>         try:
>             samdb.modify(m)
>         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):
>-- 
>1.7.9.5
>

Flags:

abartlet: review+

Actions: View

Attachments on bug 9461: 8279 | 8483 | 8484 | 8506 | 8874 | 9238 | 9239