summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Young <ayoung@redhat.com>2011-07-05 14:55:03 -0400
committerAdam Young <ayoung@redhat.com>2011-07-05 18:00:05 -0400
commita38ad1d433a4cb6d35c582d48ed044e7fbfd8508 (patch)
tree2b09b8c74f6560b27eb15641e01d822045cc6739
parenta3a9267334ad47e78f8d3b223015b5b408a2225c (diff)
downloadfreeipa-a38ad1d433a4cb6d35c582d48ed044e7fbfd8508.zip
freeipa-a38ad1d433a4cb6d35c582d48ed044e7fbfd8508.tar.gz
freeipa-a38ad1d433a4cb6d35c582d48ed044e7fbfd8508.tar.xz
password expiration label
-rw-r--r--API.txt2
-rw-r--r--install/ui/test/data/ipa_init.json20
-rw-r--r--ipalib/plugins/config.py2
3 files changed, 12 insertions, 12 deletions
diff --git a/API.txt b/API.txt
index 24f6d74..15970a0 100644
--- a/API.txt
+++ b/API.txt
@@ -340,7 +340,7 @@ option: IA5Str('ipagroupsearchfields', attribute=True, autofill=False, cli_name=
option: Bool('ipamigrationenabled', attribute=True, autofill=False, cli_name='enable_migration', label=Gettext('Enable migration mode', domain='ipa', localedir=None), multivalue=False, required=False)
option: List('ipagroupobjectclasses', attribute=True, autofill=False, cli_name='groupobjectclasses', label=Gettext('Default group objectclasses', domain='ipa', localedir=None), multivalue=True, required=False)
option: List('ipauserobjectclasses', attribute=True, autofill=False, cli_name='userobjectclasses', label=Gettext('Default user objectclasses', domain='ipa', localedir=None), multivalue=True, required=False)
-option: Int('ipapwdexpadvnotify', attribute=True, autofill=False, cli_name='pwdexpnotify', label=Gettext('Password Expiration Notification', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
+option: Int('ipapwdexpadvnotify', attribute=True, autofill=False, cli_name='pwdexpnotify', label=Gettext('Password Expiration Notification (days)', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index 07ebc66..5b4dadf 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -8653,7 +8653,7 @@
"flags": [],
"hint": null,
"include": null,
- "label": "Password Expiration Notification",
+ "label": "Password Expiration Notification (days)",
"maxvalue": 2147483647,
"minvalue": 0,
"multivalue": false,
@@ -15877,30 +15877,30 @@
"Administrator"
],
"gidnumber": [
- "1965600000"
+ "193200000"
],
"homedirectory": [
"/home/admin"
],
"ipauniqueid": [
- "9e262c00-a357-11e0-a074-525400b55a47"
+ "c300021e-a445-11e0-80b9-525400b55a47"
],
"krbextradata": [
{
- "__base64__": "AAgBAA=="
+ "__base64__": "AAL2bA5Ocm9vdC9hZG1pbkBTRVJWRVIxNS5BWU9VTkcuQk9TVE9OLkRFVkVMLlJFREhBVC5DT00A"
},
{
- "__base64__": "AAL33AxOcm9vdC9hZG1pbkBTRVJWRVIxNS5BWU9VTkcuQk9TVE9OLkRFVkVMLlJFREhBVC5DT00A"
+ "__base64__": "AAgBAA=="
}
],
"krblastpwdchange": [
- "20110630203047Z"
+ "20110702005726Z"
],
"krblastsuccessfulauth": [
- "20110701022251Z"
+ "20110705172822Z"
],
"krbpasswordexpiration": [
- "20110928203047Z"
+ "20110930005726Z"
],
"krbprincipalname": [
"admin@SERVER15.AYOUNG.BOSTON.DEVEL.REDHAT.COM"
@@ -15930,7 +15930,7 @@
"admin"
],
"uidnumber": [
- "1965600000"
+ "193200000"
]
}
],
@@ -15997,7 +15997,7 @@
"mount_jsonserver": "json",
"mount_xmlserver": "xml",
"prompt_all": false,
- "ra_plugin": "selfsign",
+ "ra_plugin": "dogtag",
"realm": "SERVER15.AYOUNG.BOSTON.DEVEL.REDHAT.COM",
"rpc_json_uri": "http://localhost:8888/ipa/json",
"script": "/var/www/mod_wsgi",
diff --git a/ipalib/plugins/config.py b/ipalib/plugins/config.py
index cbca860..3497179 100644
--- a/ipalib/plugins/config.py
+++ b/ipalib/plugins/config.py
@@ -163,7 +163,7 @@ class config(LDAPObject):
),
Int('ipapwdexpadvnotify?',
cli_name='pwdexpnotify',
- label=_('Password Expiration Notification'),
+ label=_('Password Expiration Notification (days)'),
doc=_('Number of days\'s notice of impending password expiration.'),
minvalue=0,
),