summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2010-05-05 11:55:01 -0400
committerStephen Gallagher <sgallagh@redhat.com>2010-05-07 17:14:31 -0400
commit19c62f37ad3b974eed383c602d2dd5171a23c6c6 (patch)
tree6b938eaf987f6b3c400095bf1c339ef69cc6f93a
parent2d54b2a56b83315b3f89e082f8bf89fe8132a685 (diff)
downloadsssd-19c62f37ad3b974eed383c602d2dd5171a23c6c6.tar.gz
sssd-19c62f37ad3b974eed383c602d2dd5171a23c6c6.tar.bz2
sssd-19c62f37ad3b974eed383c602d2dd5171a23c6c6.zip
Make krb5_kpasswd available for any krb5 provider
Previously, the option krb5_kpasswd was only available if 'chpass_provider = krb5' was specified explicitly. Now it will be available also if 'auth_provider = krb5'. This option was also missing from the IPA options, so I have added it there as well
-rwxr-xr-xsrc/config/SSSDConfigTest.py3
-rw-r--r--src/config/etc/sssd.api.d/sssd-ipa.conf1
-rw-r--r--src/config/etc/sssd.api.d/sssd-krb5.conf2
3 files changed, 5 insertions, 1 deletions
diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py
index e8899653..7b005f6c 100755
--- a/src/config/SSSDConfigTest.py
+++ b/src/config/SSSDConfigTest.py
@@ -543,6 +543,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
control_list.extend(
['krb5_kdcip',
'krb5_realm',
+ 'krb5_kpasswd',
'krb5_ccachedir',
'krb5_ccname_template',
'krb5_keytab',
@@ -715,6 +716,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
control_list = [
'krb5_kdcip',
'krb5_realm',
+ 'krb5_kpasswd',
'krb5_ccachedir',
'krb5_ccname_template',
'krb5_keytab',
@@ -860,6 +862,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
control_list.extend(
['krb5_kdcip',
'krb5_realm',
+ 'krb5_kpasswd',
'krb5_ccachedir',
'krb5_ccname_template',
'krb5_keytab',
diff --git a/src/config/etc/sssd.api.d/sssd-ipa.conf b/src/config/etc/sssd.api.d/sssd-ipa.conf
index c2a12d5a..f71498cc 100644
--- a/src/config/etc/sssd.api.d/sssd-ipa.conf
+++ b/src/config/etc/sssd.api.d/sssd-ipa.conf
@@ -18,6 +18,7 @@ ldap_sasl_authid = str, None, false
krb5_kdcip = str, None, false
krb5_realm = str, None, false
krb5_auth_timeout = int, None, false
+krb5_kpasswd = str, None, false
ldap_krb5_keytab = str, None, false
ldap_krb5_init_creds = bool, None, false
ldap_entry_usn = 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 7b12e08f..f03ce6db 100644
--- a/src/config/etc/sssd.api.d/sssd-krb5.conf
+++ b/src/config/etc/sssd.api.d/sssd-krb5.conf
@@ -2,6 +2,7 @@
krb5_kdcip = str, None, true
krb5_realm = str, None, true
krb5_auth_timeout = int, None, false
+krb5_kpasswd = str, None, false
[provider/krb5/auth]
krb5_ccachedir = str, None, false
@@ -11,4 +12,3 @@ krb5_validate = bool, None, false
[provider/krb5/chpass]
krb5_changepw_principal = str, None, false
-krb5_kpasswd = str, None, false