summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2010-06-10 16:16:24 +0200
committerStephen Gallagher <sgallagh@redhat.com>2010-06-14 16:54:42 -0400
commitefeada8c40ade5e6911fa5b4ba58ce8c720d18f1 (patch)
tree8ce26ee057c48139e19b8eb01fb7920fcd2c81aa
parent19e3e0bb949ccf10bc6e83cd81cbca294a99e747 (diff)
downloadsssd-efeada8c40ade5e6911fa5b4ba58ce8c720d18f1.tar.gz
sssd-efeada8c40ade5e6911fa5b4ba58ce8c720d18f1.tar.xz
sssd-efeada8c40ade5e6911fa5b4ba58ce8c720d18f1.zip
Undocument the krb5_changepw_principal option
Fixes: #531
-rw-r--r--src/config/SSSDConfig.py1
-rwxr-xr-xsrc/config/SSSDConfigTest.py3
-rw-r--r--src/config/etc/sssd.api.d/sssd-ipa.conf2
-rw-r--r--src/config/etc/sssd.api.d/sssd-krb5.conf2
-rw-r--r--src/man/sssd-krb5.5.xml15
5 files changed, 3 insertions, 20 deletions
diff --git a/src/config/SSSDConfig.py b/src/config/SSSDConfig.py
index 29de609a6..2978ef21f 100644
--- a/src/config/SSSDConfig.py
+++ b/src/config/SSSDConfig.py
@@ -103,7 +103,6 @@ option_strings = {
'krb5_store_password_if_offline' : _("Store password if offline for later online authentication"),
# [provider/krb5/chpass]
- 'krb5_changepw_principal' : _('The principal of the change password service'),
'krb5_kpasswd' : _('Server where the change password service is running if not on the KDC'),
# [provider/ldap]
diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py
index ea897d716..8cbb0f910 100755
--- a/src/config/SSSDConfigTest.py
+++ b/src/config/SSSDConfigTest.py
@@ -739,8 +739,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
#Test looking up all provider values
options = domain.list_provider_options('krb5')
- control_list.extend(['krb5_changepw_principal',
- 'krb5_kpasswd'])
+ control_list.extend(['krb5_kpasswd'])
self.assertTrue(type(options) == dict,
"Options should be a dictionary")
diff --git a/src/config/etc/sssd.api.d/sssd-ipa.conf b/src/config/etc/sssd.api.d/sssd-ipa.conf
index e3ce7a7f2..b070b63a0 100644
--- a/src/config/etc/sssd.api.d/sssd-ipa.conf
+++ b/src/config/etc/sssd.api.d/sssd-ipa.conf
@@ -80,4 +80,4 @@ ldap_pwd_policy = str, None, false
[provider/ipa/access]
[provider/ipa/chpass]
-krb5_changepw_principal = str, None, false
+
diff --git a/src/config/etc/sssd.api.d/sssd-krb5.conf b/src/config/etc/sssd.api.d/sssd-krb5.conf
index eeb8fe133..76ef8b5b4 100644
--- a/src/config/etc/sssd.api.d/sssd-krb5.conf
+++ b/src/config/etc/sssd.api.d/sssd-krb5.conf
@@ -12,4 +12,4 @@ krb5_validate = bool, None, false
krb5_store_password_if_offline = bool, None, false
[provider/krb5/chpass]
-krb5_changepw_principal = str, None, false
+
diff --git a/src/man/sssd-krb5.5.xml b/src/man/sssd-krb5.5.xml
index e78fd7676..489a5072a 100644
--- a/src/man/sssd-krb5.5.xml
+++ b/src/man/sssd-krb5.5.xml
@@ -90,21 +90,6 @@
</varlistentry>
<varlistentry>
- <term>krb5_changepw_principal (string)</term>
- <listitem>
- <para>
- The priciple of the change password service.
- If only the 'identifier/instance' part of the
- principal are given the realm part is added
- automatically.
- </para>
- <para>
- Default: kadmin/changepw
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>krb5_kpasswd (string)</term>
<listitem>
<para>