summaryrefslogtreecommitdiffstats
path: root/src/config/SSSDConfigTest.py
diff options
context:
space:
mode:
authorJan Zeleny <jzeleny@redhat.com>2010-10-14 09:37:34 +0200
committerStephen Gallagher <sgallagh@redhat.com>2010-10-19 16:02:47 -0400
commit7051a30300d12163e890e4ec4b9a765567679a8b (patch)
tree96d9f734fef8d052a4747756b11538f18e5d261f /src/config/SSSDConfigTest.py
parented9d7d200bda6f5e1a177054fb483fb48c6ad54e (diff)
downloadsssd-7051a30300d12163e890e4ec4b9a765567679a8b.tar.gz
sssd-7051a30300d12163e890e4ec4b9a765567679a8b.tar.xz
sssd-7051a30300d12163e890e4ec4b9a765567679a8b.zip
Option krb5_server is now used to store a list of KDCs instead of krb5_kdcip.
For the time being, if krb5_server is not found, still falls back to krb5_kdcip with a warning. If both options are present in config file, krb5_server has a higher priority. Fixes: #543
Diffstat (limited to 'src/config/SSSDConfigTest.py')
-rwxr-xr-xsrc/config/SSSDConfigTest.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py
index f0cfac8b8..39db49dc3 100755
--- a/src/config/SSSDConfigTest.py
+++ b/src/config/SSSDConfigTest.py
@@ -541,7 +541,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
backup_list = control_list[:]
control_list.extend(
- ['krb5_kdcip',
+ ['krb5_server',
'krb5_realm',
'krb5_kpasswd',
'krb5_ccachedir',
@@ -562,6 +562,8 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
"Option [%s] missing" %
option)
+ control_list.extend(['krb5_kdcip'])
+
# Ensure that there aren't any unexpected options listed
for option in options.keys():
self.assertTrue(option in control_list,
@@ -712,6 +714,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
# Test looking up a specific provider type
options = domain.list_provider_options('krb5', 'auth')
control_list = [
+ 'krb5_server',
'krb5_kdcip',
'krb5_realm',
'krb5_kpasswd',
@@ -859,7 +862,8 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
backup_list = control_list[:]
control_list.extend(
- ['krb5_kdcip',
+ ['krb5_server',
+ 'krb5_kdcip',
'krb5_realm',
'krb5_kpasswd',
'krb5_ccachedir',