From: Andrew Bartlett Date: Thu, 9 May 2013 03:16:55 +0000 (+1200) Subject: python-samba-tool fsmo: Do not give an error on a successful role transfer X-Git-Tag: tevent-0.9.20~976 X-Git-Url: http://git.samba.org/samba.git/?p=nivanova%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=8d8872ae0a19786452c3be044757b16814b82be8 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 Reviewed-by: Stefan Metzmacher Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Mon Sep 23 12:00:24 CEST 2013 on sn-devel-104 --- diff --git a/python/samba/netcmd/fsmo.py b/python/samba/netcmd/fsmo.py index c938c915fa9..02721f97707 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):