summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSumit Bose <sbose@redhat.com>2013-10-29 11:37:03 +0100
committerMartin Kosek <mkosek@redhat.com>2013-11-01 09:28:35 +0100
commitb5e60c20201d174cdf4df51a1443ab295cc086b9 (patch)
tree5435713e87197f967dd7903dd5e09cec8646f39d
parent941e9686a379aea56900d8e3194cef231c4e1406 (diff)
downloadfreeipa-b5e60c20201d174cdf4df51a1443ab295cc086b9.tar.gz
freeipa-b5e60c20201d174cdf4df51a1443ab295cc086b9.tar.xz
freeipa-b5e60c20201d174cdf4df51a1443ab295cc086b9.zip
Remove AllowLMhash from the allowed IPA config strings
Fixes https://fedorahosted.org/freeipa/ticket/3795
-rw-r--r--API.txt2
-rw-r--r--install/ui/src/freeipa/serverconfig.js2
-rw-r--r--install/ui/test/data/ipa_init_commands.json1
-rw-r--r--install/ui/test/data/ipa_init_objects.json1
-rw-r--r--ipalib/plugins/config.py2
5 files changed, 3 insertions, 5 deletions
diff --git a/API.txt b/API.txt
index 40871f6a8..605f9ee30 100644
--- a/API.txt
+++ b/API.txt
@@ -499,7 +499,7 @@ args: 0,24,3
option: Str('addattr*', cli_name='addattr', exclude='webui')
option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
option: Str('delattr*', cli_name='delattr', exclude='webui')
-option: StrEnum('ipaconfigstring', attribute=True, autofill=False, cli_name='ipaconfigstring', csv=True, multivalue=True, required=False, values=(u'AllowLMhash', u'AllowNThash', u'KDC:Disable Last Success', u'KDC:Disable Lockout'))
+option: StrEnum('ipaconfigstring', attribute=True, autofill=False, cli_name='ipaconfigstring', csv=True, multivalue=True, required=False, values=(u'AllowNThash', u'KDC:Disable Last Success', u'KDC:Disable Lockout'))
option: Str('ipadefaultemaildomain', attribute=True, autofill=False, cli_name='emaildomain', multivalue=False, required=False)
option: Str('ipadefaultloginshell', attribute=True, autofill=False, cli_name='defaultshell', multivalue=False, required=False)
option: Str('ipadefaultprimarygroup', attribute=True, autofill=False, cli_name='defaultgroup', multivalue=False, required=False)
diff --git a/install/ui/src/freeipa/serverconfig.js b/install/ui/src/freeipa/serverconfig.js
index 94e1454ad..7dea5d1f5 100644
--- a/install/ui/src/freeipa/serverconfig.js
+++ b/install/ui/src/freeipa/serverconfig.js
@@ -69,7 +69,7 @@ return {
name: 'ipaconfigstring',
$type: 'checkboxes',
options: IPA.create_options([
- 'AllowLMhash', 'AllowNThash',
+ 'AllowNThash',
'KDC:Disable Last Success', 'KDC:Disable Lockout'
])
},
diff --git a/install/ui/test/data/ipa_init_commands.json b/install/ui/test/data/ipa_init_commands.json
index 4f28701fb..207318115 100644
--- a/install/ui/test/data/ipa_init_commands.json
+++ b/install/ui/test/data/ipa_init_commands.json
@@ -2278,7 +2278,6 @@
"name": "ipaconfigstring",
"type": "unicode",
"values": [
- "AllowLMhash",
"AllowNThash",
"KDC:Disable Last Success",
"KDC:Disable Lockout"
diff --git a/install/ui/test/data/ipa_init_objects.json b/install/ui/test/data/ipa_init_objects.json
index bef3cc65d..8550e8280 100644
--- a/install/ui/test/data/ipa_init_objects.json
+++ b/install/ui/test/data/ipa_init_objects.json
@@ -580,7 +580,6 @@
"name": "ipaconfigstring",
"type": "unicode",
"values": [
- "AllowLMhash",
"AllowNThash",
"KDC:Disable Last Success",
"KDC:Disable Lockout"
diff --git a/ipalib/plugins/config.py b/ipalib/plugins/config.py
index b9cf05016..fbaacb7b9 100644
--- a/ipalib/plugins/config.py
+++ b/ipalib/plugins/config.py
@@ -178,7 +178,7 @@ class config(LDAPObject):
cli_name='ipaconfigstring',
label=_('Password plugin features'),
doc=_('Extra hashes to generate in password plug-in'),
- values=(u'AllowLMhash', u'AllowNThash',
+ values=(u'AllowNThash',
u'KDC:Disable Last Success', u'KDC:Disable Lockout'),
csv=True,
),