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
This commit is contained in:
Rob Crittenden 2008-03-31 15:17:39 -04:00
parent 58cfc7ab68
commit 4b4a13c201

View File

@ -282,9 +282,24 @@ class UserController(IPAController):
try: try:
dnadds = kw.get('dnadd') dnadds = kw.get('dnadd')
cherrypy.session['uid'] = user_dict.get('uid') cherrypy.session['uid'] = user_dict.get('uid')
# remove the default group from failed add
if dnadds != None: if dnadds != None:
try:
conf=client.get_ipa_config()
default_cn="cn=%s" % conf.getValue('ipadefaultprimarygroup')
if not(isinstance(dnadds,list) or isinstance(dnadds,tuple)): if not(isinstance(dnadds,list) or isinstance(dnadds,tuple)):
dnadds = [dnadds] 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( failed_adds = client.add_groups_to_user(
utf8_encode_values(dnadds), user.dn) utf8_encode_values(dnadds), user.dn)
kw['dnadd'] = failed_adds kw['dnadd'] = failed_adds