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

[Marc Muehlfeld]

Hello Christian,

Am 09.06.2015 um 20:40 schrieb Christian Ambach:
> After a second look, how about moving the SFU attributes addition to the
> same place in the function? See the attached follow-up patch.

Yes, better. Attached a new version, containing that change. Ready to push?


Regards,
Marc

-------------- next part --------------
From 58f95178afeb8649e0ac98fa72ba9d8f955546a0 Mon Sep 17 00:00:00 2001
From: Marc Muehlfeld <mmuehlfeld at samba.org>
Date: Thu, 11 Jun 2015 21:20:55 +0200
Subject: [PATCH] Group creation: Add msSFU30Name only when --nis-domain was
 given

This fixes a bug, that all new created groups automatically get an
msSFU30Name attribute added. This should only be the case, when
we also have a nis-domain (samba-tool --nis-domain=...).

Bugreport: https://bugzilla.samba.org/show_bug.cgi?id=11315

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

diff --git a/python/samba/samdb.py b/python/samba/samdb.py
index e74e823..e3a6292 100644
--- a/python/samba/samdb.py
+++ b/python/samba/samdb.py
@@ -191,8 +191,6 @@ pwdLastSet: 0
             "sAMAccountName": groupname,
             "objectClass": "group"}
 
-        ldbmessage["msSFU30Name"] = groupname
-
         if grouptype is not None:
             ldbmessage["groupType"] = normalise_int32(grouptype)
 
@@ -209,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:
-- 
2.4.3