summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Myllynen <myllynen@redhat.com>2011-09-16 10:11:19 +0300
committerStephen Gallagher <sgallagh@redhat.com>2011-09-20 10:43:11 -0400
commit307b13bf91a8f70fe81949dfc3548ed2796e890a (patch)
treed41a7c9bd41e43cc06f8f556f16cd07abb48b2ff
parentc6fbe644aec3f174e25e789d08a337085917bd31 (diff)
downloadsssd-307b13bf91a8f70fe81949dfc3548ed2796e890a.tar.gz
sssd-307b13bf91a8f70fe81949dfc3548ed2796e890a.tar.xz
sssd-307b13bf91a8f70fe81949dfc3548ed2796e890a.zip
Add missing options to sssd.api.conf
-rwxr-xr-xsrc/config/SSSDConfigTest.py18
-rw-r--r--src/config/etc/sssd.api.conf5
-rw-r--r--src/config/etc/sssd.api.d/sssd-local.conf6
3 files changed, 26 insertions, 3 deletions
diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py
index 4de2119d3..b4a1564b9 100755
--- a/src/config/SSSDConfigTest.py
+++ b/src/config/SSSDConfigTest.py
@@ -470,6 +470,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
'min_id',
'max_id',
'timeout',
+ 'try_inotify',
'command',
'enumerate',
'cache_credentials',
@@ -521,7 +522,13 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
domain.add_provider('local', 'id')
control_list.extend(
['default_shell',
- 'base_directory'])
+ 'base_directory',
+ 'create_homedir',
+ 'remove_homedir',
+ 'homedir_umask',
+ 'skel_dir',
+ 'mail_dir',
+ 'userdel_cmd'])
options = domain.list_options()
@@ -776,6 +783,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
'min_id',
'max_id',
'timeout',
+ 'try_inotify',
'command',
'enumerate',
'cache_credentials',
@@ -827,7 +835,13 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
domain.add_provider('local', 'id')
control_list.extend(
['default_shell',
- 'base_directory'])
+ 'base_directory',
+ 'create_homedir',
+ 'remove_homedir',
+ 'homedir_umask',
+ 'skel_dir',
+ 'mail_dir',
+ 'userdel_cmd'])
options = domain.list_options()
diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf
index 84d470fa6..6813901ed 100644
--- a/src/config/etc/sssd.api.conf
+++ b/src/config/etc/sssd.api.conf
@@ -23,7 +23,7 @@ krb5_rcache_dir = str, None, false
[nss]
# Name service
enum_cache_timeout = int, None, false
-entry_cache_no_wait_percentage = int, None, false
+entry_cache_nowait_percentage = int, None, false
entry_negative_timeout = int, None, false
filter_users = list, str, false
filter_groups = list, str, false
@@ -31,6 +31,7 @@ filter_users_in_groups = bool, None, false
pwfield = str, None, false
override_homedir = str, None, false
allowed_shells = list, str, false
+vetoed_shells = list, str, false
shell_fallback = str, None, false
[pam]
@@ -58,6 +59,7 @@ command = str, None, false
min_id = int, None, false
max_id = int, None, false
timeout = int, None, false
+try_inotify = bool, None, false
enumerate = bool, None, false
cache_credentials = bool, None, false
store_legacy_passwords = bool, None, false
@@ -72,6 +74,7 @@ dns_discovery_domain = str, None, false
override_gid = int, None, false
override_homedir = str, None, false
+
# Special providers
[provider/permit]
diff --git a/src/config/etc/sssd.api.d/sssd-local.conf b/src/config/etc/sssd.api.d/sssd-local.conf
index f740b5ba1..b48893852 100644
--- a/src/config/etc/sssd.api.d/sssd-local.conf
+++ b/src/config/etc/sssd.api.d/sssd-local.conf
@@ -1,4 +1,10 @@
[provider/local]
+create_homedir = bool, None, false
+remove_homedir = bool, None, false
+homedir_umask = int, None, false
+skel_dir = str, None, false
+mail_dir = str, None, false
+userdel_cmd = str, None, false
[provider/local/id]
default_shell = str, None, false