diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2012-02-17 12:14:39 -0500 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2012-06-22 15:37:42 -0400 |
| commit | dd60af1ca6f5887f12ff50532e2fde5f16c9d55b (patch) | |
| tree | db6a93b5abc53dad733174eaf188ada0cbc010d2 /src/config | |
| parent | 41fbb0ef19bc4e6d336585a7d6ade968700ebd04 (diff) | |
| download | sssd-dd60af1ca6f5887f12ff50532e2fde5f16c9d55b.tar.gz sssd-dd60af1ca6f5887f12ff50532e2fde5f16c9d55b.tar.xz sssd-dd60af1ca6f5887f12ff50532e2fde5f16c9d55b.zip | |
RESPONDERS: Make the fd_limit setting configurable
This code will now attempt first to see if it has privilege to set
the value as specified, and if not it will fall back to the
previous behavior. So on systems with the CAP_SYS_RESOURCE
capability granted to SSSD, it will be able to ignore the
limits.conf hard limit.
https://fedorahosted.org/sssd/ticket/1197
Conflicts:
src/config/SSSDConfig.py
src/config/SSSDConfigTest.py
src/config/etc/sssd.api.conf
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/SSSDConfig.py | 1 | ||||
| -rwxr-xr-x | src/config/SSSDConfigTest.py | 3 | ||||
| -rw-r--r-- | src/config/etc/sssd.api.conf | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/config/SSSDConfig.py b/src/config/SSSDConfig.py index df22d16d0..a20ac972d 100644 --- a/src/config/SSSDConfig.py +++ b/src/config/SSSDConfig.py @@ -43,6 +43,7 @@ option_strings = { 'command' : _('Command to start service'), 'reconnection_retries' : _('Number of times to attempt connection to Data Providers'), 'client_idle_timeout' : _('Idle time before automatic disconnection of a client'), + 'fd_limit' : _('The number of file descriptors that may be opened by this responder'), # [sssd] 'services' : _('SSSD Services to start'), diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py index 71397409b..54012b712 100755 --- a/src/config/SSSDConfigTest.py +++ b/src/config/SSSDConfigTest.py @@ -272,7 +272,8 @@ class SSSDConfigTestSSSDService(unittest.TestCase): 'debug_to_files', 'command', 'reconnection_retries', - 'client_idle_timeout'] + 'client_idle_timeout', + 'fd_limit'] self.assertTrue(type(options) == dict, "Options should be a dictionary") diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf index f952673a7..f4b0bbaf0 100644 --- a/src/config/etc/sssd.api.conf +++ b/src/config/etc/sssd.api.conf @@ -9,6 +9,7 @@ debug_to_files = bool, None, false command = str, None, false reconnection_retries = int, None, false client_idle_timeout = int, None, false +fd_limit = int, None, false [sssd] # Monitor service |