[PATCH] Group creation: Add msSFU30Name only when --nis-domain was, given

[Christian Ambach]

>> attached a patch for
>> https://bugzilla.samba.org/show_bug.cgi?id=11315
>>
>> Please review and push, if OK.
>> Thanks.
>
> Reviewed-by: Christian Ambach <ambi at samba.org>

Hi Marc,

After a second look, how about moving the SFU attributes addition to the 
same place in the function? See the attached follow-up patch.

Cheers,
Christian


-------------- next part --------------
From 4d1d2e2faafb594dd832301ac72c1cec27cfe60e Mon Sep 17 00:00:00 2001
From: Christian Ambach <ambi at samba.org>
Date: Tue, 9 Jun 2015 20:37:49 +0200
Subject: [PATCH] samba-tool: small cleanup

move the addition of the msSFU attributes under the same if-check

Signed-off-by: Christian Ambach <ambi at samba.org>
---
 python/samba/samdb.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/python/samba/samdb.py b/python/samba/samdb.py
index 2f682a9..e3a6292 100644
--- a/python/samba/samdb.py
+++ b/python/samba/samdb.py
@@ -191,9 +191,6 @@ pwdLastSet: 0
             "sAMAccountName": groupname,
             "objectClass": "group"}
 
-        if nisdomain is not None:
-            ldbmessage["msSFU30Name"] = groupname
-
         if grouptype is not None:
             ldbmessage["groupType"] = normalise_int32(grouptype)
 
@@ -210,6 +207,7 @@ pwdLastSet: 0
             ldbmessage["gidNumber"] = normalise_int32(gidnumber)
 
         if nisdomain is not None:
+            ldbmessage["msSFU30Name"] = groupname
             ldbmessage["msSFU30NisDomain"] = nisdomain
 
         if sd is not None:
-- 
1.9.1