From 4b4a13c20140b08b075611b93c5edf281a2f30ea Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Mon, 31 Mar 2008 15:17:39 -0400
Subject: Don't try to add the default group to a user when creating the group.
 This is done automatically and trying to do so will return an error.

432106
---
 ipa-server/ipa-gui/ipagui/subcontrollers/user.py | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/user.py b/ipa-server/ipa-gui/ipagui/subcontrollers/user.py
index 1ddc6f07..5baaf3fb 100644
--- a/ipa-server/ipa-gui/ipagui/subcontrollers/user.py
+++ b/ipa-server/ipa-gui/ipagui/subcontrollers/user.py
@@ -282,11 +282,26 @@ class UserController(IPAController):
         try:
             dnadds = kw.get('dnadd')
             cherrypy.session['uid'] = user_dict.get('uid')
+
+            # remove the default group from failed add
             if dnadds != None:
-                if not(isinstance(dnadds,list) or isinstance(dnadds,tuple)):
-                    dnadds = [dnadds]
-                failed_adds = client.add_groups_to_user(
-                        utf8_encode_values(dnadds), user.dn)
+                try:
+                    conf=client.get_ipa_config()
+                    default_cn="cn=%s" % conf.getValue('ipadefaultprimarygroup')
+                
+                    if not(isinstance(dnadds,list) or isinstance(dnadds,tuple)):
+                        dnadds = [dnadds]
+
+                    for d in dnadds:
+                        e = d.find(default_cn)
+                        if e >= 0:
+                            dnadds.remove(d)
+                except:
+                    pass
+
+                if len(dnadds) > 0:
+                    failed_adds = client.add_groups_to_user(
+                            utf8_encode_values(dnadds), user.dn)
                 kw['dnadd'] = failed_adds
         except ipaerror.IPAError, e:
             failed_adds = dnadds
-- 
cgit