From 131684b9107a3fc07906013d16b35975531f2864 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Tue, 26 Apr 2016 11:04:36 -0400
Subject: DEBUG: Add `debug` alias for debug_level
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Our users constantly make the mistake of typing `debug = 9` in the
sssd.conf instead of `debug_level = 9` as would be correct. This
happens frequently-enough that we should just alias it rather than
continue to have people make mistakes.

Resolves:
https://fedorahosted.org/sssd/ticket/2999

Reviewed-by: Pavel Březina <pbrezina@redhat.com>
Reviewed-by: Petr Cech <pcech@redhat.com>
---
 src/config/SSSDConfig/__init__.py.in | 1 +
 src/config/SSSDConfigTest.py         | 3 +++
 src/config/etc/sssd.api.conf         | 2 ++
 3 files changed, 6 insertions(+)

(limited to 'src/config')

diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in
index abbf5dca8..06127584f 100644
--- a/src/config/SSSDConfig/__init__.py.in
+++ b/src/config/SSSDConfig/__init__.py.in
@@ -40,6 +40,7 @@ else:
 # TODO: This needs to be made external
 option_strings = {
     # [service]
+    'debug' : _('Set the verbosity of the debug logging'),
     'debug_level' : _('Set the verbosity of the debug logging'),
     'debug_timestamps' : _('Include timestamps in debug logs'),
     'debug_microseconds' : _('Include microseconds in timestamps in debug logs'),
diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py
index e518c7565..6ec30234e 100755
--- a/src/config/SSSDConfigTest.py
+++ b/src/config/SSSDConfigTest.py
@@ -299,6 +299,7 @@ class SSSDConfigTestSSSDService(unittest.TestCase):
             'krb5_rcache_dir',
             'user',
             'default_domain_suffix',
+            'debug',
             'debug_level',
             'debug_timestamps',
             'debug_microseconds',
@@ -497,6 +498,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
         options = domain.list_options()
         control_list = [
             'description',
+            'debug',
             'debug_level',
             'debug_timestamps',
             'min_id',
@@ -863,6 +865,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
         options = domain.list_options()
         control_list = [
             'description',
+            'debug',
             'debug_level',
             'debug_timestamps',
             'min_id',
diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf
index fef55364d..91146593d 100644
--- a/src/config/etc/sssd.api.conf
+++ b/src/config/etc/sssd.api.conf
@@ -3,6 +3,7 @@
 
 [service]
 # Options available to all services
+debug = int, None, false
 debug_level = int, None, false
 debug_timestamps = bool, None, false
 debug_microseconds = bool, None, false
@@ -108,6 +109,7 @@ subdomains_provider = str, None, false
 [domain]
 # Options available to all domains
 description = str, None, false
+debug = int, None, false
 debug_level = int, None, false
 debug_timestamps = bool, None, false
 command = str, None, false
-- 
cgit