Attachment 11112 Details for Bug 10924 – Patch for v4-2-test

[patch] Patch for v4-2-test

tmp42.diff.txt (text/plain), 1.58 KB, created by Stefan Metzmacher on 2015-06-01 08:03:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2015-06-01 08:03:51 UTC

Size: 1.58 KB

patch

obsolete

>From 3688ecd8daa67ecd8175916391d835487f0acf38 Mon Sep 17 00:00:00 2001
>From: Steve Howells <steve.howells@moscowfirst.com>
>Date: Sat, 31 Jan 2015 16:09:17 +0000
>Subject: [PATCH] s4.2/fsmo.py: fixed fsmo transfer exception
>
>In transfer_role() there is an duplicate call to samdb.modify() inside the if statement
>where the type of role is being determined (specifically for the naming fsmo). This
>call is unnecessary as after the if statement their is a correct call, with a try/catch
>block, used by all fsmo transfers that will handle errors - such as the DC with the
>fsmo role being offline.
>
>The call to samdb.modify() inside the if statement for naming fsmo has been removed.
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=10924
>
>Signed-off-by: Steve Howells <steve.howells@moscowfirst.com>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Marc Muehlfeld <mmuehlfeld@samba.org>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>(cherry picked from commit 9198246f91c02e33ed7a3580588557d0fb9f8811)
>---
> python/samba/netcmd/fsmo.py | 1 -
> 1 file changed, 1 deletion(-)
>
>diff --git a/python/samba/netcmd/fsmo.py b/python/samba/netcmd/fsmo.py
>index 02721f9..1bc4a96 100644
>--- a/python/samba/netcmd/fsmo.py
>+++ b/python/samba/netcmd/fsmo.py
>@@ -50,7 +50,6 @@ def transfer_role(outf, role, samdb):
>         m["becomeDomainMaster"]= ldb.MessageElement(
>             "1", ldb.FLAG_MOD_REPLACE,
>             "becomeDomainMaster")
>-        samdb.modify(m)
>     elif role == "infrastructure":
>         m["becomeInfrastructureMaster"]= ldb.MessageElement(
>             "1", ldb.FLAG_MOD_REPLACE,
>-- 
>1.9.1
>

Flags:

metze: review? (abartlet)
mmuehlfeld: review+

Actions: View

Attachments on bug 10924: 10799 | 10873 | 11112 | 11113