diff options
author | Rob Crittenden <rcritten@redhat.com> | 2008-01-31 17:38:21 -0500 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2008-01-31 17:38:21 -0500 |
commit | 15e2abaa25b35f4895300f8cfdd72eed6812f6fa (patch) | |
tree | 462f5a24753fb389c4a7003bd7405b37bb66d6e7 /ipa-server/ipa-gui | |
parent | 1b988fff8206290664931e0ce99e4fb897d0ac48 (diff) | |
download | freeipa-15e2abaa25b35f4895300f8cfdd72eed6812f6fa.tar.gz freeipa-15e2abaa25b35f4895300f8cfdd72eed6812f6fa.tar.xz freeipa-15e2abaa25b35f4895300f8cfdd72eed6812f6fa.zip |
Use orig_user_dict to get krbprincipalname when changing passwords.
Add an extra exception handler so we don't return a 500 on errors.
Diffstat (limited to 'ipa-server/ipa-gui')
-rw-r--r-- | ipa-server/ipa-gui/ipagui/subcontrollers/user.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/user.py b/ipa-server/ipa-gui/ipagui/subcontrollers/user.py index cc2bba476..463f5ca66 100644 --- a/ipa-server/ipa-gui/ipagui/subcontrollers/user.py +++ b/ipa-server/ipa-gui/ipagui/subcontrollers/user.py @@ -518,12 +518,17 @@ class UserController(IPAController): # try: if password_change: - rv = client.modifyPassword(kw['krbprincipalname'], "", kw.get('userpassword')) + rv = client.modifyPassword(orig_user_dict['krbprincipalname'], "", kw.get('userpassword')) except ipaerror.IPAError, e: turbogears.flash("User password change failed: " + str(e) + "<br/>" + e.detail[0]['desc']) return dict(form=user_edit_form, user=kw, user_groups=user_groups_dicts, tg_template='ipagui.templates.useredit') + except Exception, e: + turbogears.flash("User password change failed: " + str(e)) + return dict(form=user_edit_form, user=kw, + user_groups=user_groups_dicts, + tg_template='ipagui.templates.useredit') # # Add groups |