diff options
author | Rob Crittenden <rcritten@redhat.com> | 2008-03-24 10:53:33 -0400 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2008-03-24 10:53:33 -0400 |
commit | 0b7117596d1ba201d8c8713bbc43fdbb04726d2d (patch) | |
tree | 3d9fc7c6a751f9ea6dd155be6f5fe4142c6eed3f /ipa-server/ipa-gui/ipagui/forms | |
parent | 6464c40424626701a39d99a524b33020312769b1 (diff) | |
download | freeipa-0b7117596d1ba201d8c8713bbc43fdbb04726d2d.tar.gz freeipa-0b7117596d1ba201d8c8713bbc43fdbb04726d2d.tar.xz freeipa-0b7117596d1ba201d8c8713bbc43fdbb04726d2d.zip |
We are really changing the kerberos principal key and not the password when
we do updates, so use the right terminology internally. Also fix the actual
field we update (and grant permission appropriately in delegations).
The DS password handles updating userPassword and any Samba passwords
as necessary.
438256
Diffstat (limited to 'ipa-server/ipa-gui/ipagui/forms')
-rw-r--r-- | ipa-server/ipa-gui/ipagui/forms/delegate.py | 2 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/forms/user.py | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ipa-server/ipa-gui/ipagui/forms/delegate.py b/ipa-server/ipa-gui/ipagui/forms/delegate.py index bb913483..0c080b32 100644 --- a/ipa-server/ipa-gui/ipagui/forms/delegate.py +++ b/ipa-server/ipa-gui/ipagui/forms/delegate.py @@ -29,7 +29,7 @@ aci_attrs = [ UserFields.displayname, UserFields.initials, UserFields.uid, - UserFields.userpassword, + UserFields.krbprincipalkey, UserFields.uidnumber, UserFields.gidnumber, UserFields.homedirectory, diff --git a/ipa-server/ipa-gui/ipagui/forms/user.py b/ipa-server/ipa-gui/ipagui/forms/user.py index 439b3a34..a149dc47 100644 --- a/ipa-server/ipa-gui/ipagui/forms/user.py +++ b/ipa-server/ipa-gui/ipagui/forms/user.py @@ -29,8 +29,8 @@ class UserFields(object): initials = widgets.TextField(name="initials", label="Initials") uid = widgets.TextField(name="uid", label="Login", attrs=dict(onchange="warnRDN(this.id)")) - userpassword = widgets.PasswordField(name="userpassword", label="Password") - userpassword_confirm = widgets.PasswordField(name="userpassword_confirm", + krbprincipalkey = widgets.PasswordField(name="krbprincipalkey", label="Password") + krbprincipalkey_confirm = widgets.PasswordField(name="krbprincipalkey_confirm", label="Confirm Password") uidnumber = widgets.TextField(name="uidnumber", label="UID") gidnumber = widgets.TextField(name="gidnumber", label="GID") @@ -85,15 +85,15 @@ class UserFields(object): class UserNewValidator(validators.Schema): uid = validators.PlainText(not_empty=True) - userpassword = validators.String(not_empty=False) - userpassword_confirm = validators.String(not_empty=False) + krbprincipalkey = validators.String(not_empty=False) + krbprincipalkey_confirm = validators.String(not_empty=False) givenname = validators.String(not_empty=True) sn = validators.String(not_empty=True) cn = validators.ForEach(validators.String(not_empty=True)) mail = validators.Email(not_empty=False) chained_validators = [ - validators.FieldsMatch('userpassword', 'userpassword_confirm') + validators.FieldsMatch('krbprincipalkey', 'krbprincipalkey_confirm') ] @@ -121,8 +121,8 @@ class UserNewForm(widgets.Form): super(UserNewForm,self).update_params(params) class UserEditValidator(validators.Schema): - userpassword = validators.String(not_empty=False) - userpassword_confirm = validators.String(not_empty=False) + krbprincipalkey = validators.String(not_empty=False) + krbprincipalkey_confirm = validators.String(not_empty=False) givenname = validators.String(not_empty=True) sn = validators.String(not_empty=True) cn = validators.ForEach(validators.String(not_empty=True)) @@ -137,7 +137,7 @@ class UserEditValidator(validators.Schema): ] chained_validators = [ - validators.FieldsMatch('userpassword', 'userpassword_confirm') + validators.FieldsMatch('krbprincipalkey', 'krbprincipalkey_confirm') ] class UserEditForm(widgets.Form): |