summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-05-09 15:16:55 +1200
committerStefan Metzmacher <metze@samba.org>2013-09-23 12:00:24 +0200
commit8d8872ae0a19786452c3be044757b16814b82be8 (patch)
treefeb6ef06a4c9f1046535fd191eeaa81992e0f608
parentabb47b6ef8ab8cfadd00c8b10c0d975833981dd3 (diff)
downloadsamba-8d8872ae0a19786452c3be044757b16814b82be8.tar.gz
samba-8d8872ae0a19786452c3be044757b16814b82be8.tar.bz2
samba-8d8872ae0a19786452c3be044757b16814b82be8.zip
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
-rw-r--r--python/samba/netcmd/fsmo.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/python/samba/netcmd/fsmo.py b/python/samba/netcmd/fsmo.py
index c938c915fa..02721f9770 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):