From 2b66f65216de534110b4997c567f2785395e41b1 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Wed, 5 May 2010 11:55:01 -0400
Subject: 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
---
 src/config/SSSDConfigTest.py             | 3 +++
 src/config/etc/sssd.api.d/sssd-ipa.conf  | 1 +
 src/config/etc/sssd.api.d/sssd-krb5.conf | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py
index e88996534..7b005f6ca 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 c2a12d5a6..f71498cc2 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 7b12e08f0..f03ce6dbd 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
-- 
cgit