Update DEBUG* invocations to use new levels

Use a script to update DEBUG* macro invocations, which use literal
numbers for levels, to use bitmask macros instead:

grep -rl --include '*.[hc]' DEBUG . |
    while read f; do
        mv "$f"{,.orig}
        perl -e 'use strict;
                 use File::Slurp;
                 my @map=qw"
                    SSSDBG_FATAL_FAILURE
                    SSSDBG_CRIT_FAILURE
                    SSSDBG_OP_FAILURE
                    SSSDBG_MINOR_FAILURE
                    SSSDBG_CONF_SETTINGS
                    SSSDBG_FUNC_DATA
                    SSSDBG_TRACE_FUNC
                    SSSDBG_TRACE_LIBS
                    SSSDBG_TRACE_INTERNAL
                    SSSDBG_TRACE_ALL
                 ";
                 my $text=read_file(\*STDIN);
                 my $repl;
                 $text=~s/
                            ^
                            (
                                .*
                                \b
                                (DEBUG|DEBUG_PAM_DATA|DEBUG_GR_MEM)
                                \s*
                                \(\s*
                            )(
                                [0-9]
                            )(
                                \s*,
                            )
                            (
                                \s*
                            )
                            (
                                .*
                            )
                            $
                         /
                            $repl = $1.$map[$3].$4.$5.$6,
                            length($repl) <= 80
                                ? $repl
                                : $1.$map[$3].$4."\n".(" " x length($1)).$6
                         /xmge;
                 print $text;
        ' < "$f.orig" > "$f"
        rm "$f.orig"
    done

Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
Reviewed-by: Stephen Gallagher <sgallagh@redhat.com>
Reviewed-by: Simo Sorce <simo@redhat.com>

1 files changed, 27 insertions, 15 deletions

diff --git a/src/responder/common/negcache.c b/src/responder/common/negcache.c
index eaf9373ad..88dd18fa5 100644
--- a/src/responder/common/negcache.c
+++ b/src/responder/common/negcache.c
@@ -82,7 +82,7 @@ static int sss_ncache_check_str(struct sss_nc_ctx *ctx, char *str, int ttl)
     char *ep;
     int ret;
 
-    DEBUG(8, "Checking negative cache for [%s]\n", str);
+    DEBUG(SSSDBG_TRACE_INTERNAL, "Checking negative cache for [%s]\n", str);
 
     data.dptr = NULL;
 
@@ -157,12 +157,12 @@ static int sss_ncache_set_str(struct sss_nc_ctx *ctx,
     ret = string_to_tdb_data(timest, &data);
     if (ret != EOK) goto done;
 
-    DEBUG(6, "Adding [%s] to negative cache%s\n",
+    DEBUG(SSSDBG_TRACE_FUNC, "Adding [%s] to negative cache%s\n",
               str, permanent?" permanently":"");
 
     ret = tdb_store(ctx->tdb, key, data, TDB_REPLACE);
     if (ret != 0) {
-        DEBUG(1, "Negative cache failed to set entry: [%s]\n",
+        DEBUG(SSSDBG_CRIT_FAILURE, "Negative cache failed to set entry: [%s]\n",
                   tdb_errorstr(ctx->tdb));
         ret = EFAULT;
     }
@@ -631,13 +631,15 @@ errno_t sss_ncache_prepopulate(struct sss_nc_ctx *ncache,
                                              filter_list[i],
                                              &domainname, &name);
             if (ret != EOK) {
-                DEBUG(1, "Invalid name in filterUsers list: [%s] (%d)\n",
+                DEBUG(SSSDBG_CRIT_FAILURE,
+                      "Invalid name in filterUsers list: [%s] (%d)\n",
                          filter_list[i], ret);
                 continue;
             }
 
             if (domainname && strcmp(domainname, dom->name)) {
-                DEBUG(1, "Mismatch between domain name (%s) and name "
+                DEBUG(SSSDBG_CRIT_FAILURE,
+                      "Mismatch between domain name (%s) and name "
                           "set in FQN  (%s), skipping user %s\n",
                           dom->name, domainname, name);
                 continue;
@@ -645,7 +647,8 @@ errno_t sss_ncache_prepopulate(struct sss_nc_ctx *ncache,
 
             ret = sss_ncache_set_user(ncache, true, dom, name);
             if (ret != EOK) {
-                DEBUG(1, "Failed to store permanent user filter for [%s]"
+                DEBUG(SSSDBG_CRIT_FAILURE,
+                      "Failed to store permanent user filter for [%s]"
                           " (%d [%s])\n", filter_list[i],
                           ret, strerror(ret));
                 continue;
@@ -677,7 +680,8 @@ errno_t sss_ncache_prepopulate(struct sss_nc_ctx *ncache,
                                          rctx->default_domain, filter_list[i],
                                          &domainname, &name);
         if (ret != EOK) {
-            DEBUG(1, "Invalid name in filterUsers list: [%s] (%d)\n",
+            DEBUG(SSSDBG_CRIT_FAILURE,
+                  "Invalid name in filterUsers list: [%s] (%d)\n",
                      filter_list[i], ret);
             continue;
         }
@@ -691,7 +695,8 @@ errno_t sss_ncache_prepopulate(struct sss_nc_ctx *ncache,
 
             ret = sss_ncache_set_user(ncache, true, dom, name);
             if (ret != EOK) {
-                DEBUG(1, "Failed to store permanent user filter for [%s]"
+                DEBUG(SSSDBG_CRIT_FAILURE,
+                      "Failed to store permanent user filter for [%s]"
                           " (%d [%s])\n", filter_list[i],
                           ret, strerror(ret));
                 continue;
@@ -700,7 +705,8 @@ errno_t sss_ncache_prepopulate(struct sss_nc_ctx *ncache,
             for (dom = domain_list; dom; dom = get_next_domain(dom, false)) {
                 ret = sss_ncache_set_user(ncache, true, dom, name);
                 if (ret != EOK) {
-                   DEBUG(1, "Failed to store permanent user filter for"
+                   DEBUG(SSSDBG_CRIT_FAILURE,
+                         "Failed to store permanent user filter for"
                              " [%s:%s] (%d [%s])\n",
                              dom->name, filter_list[i],
                              ret, strerror(ret));
@@ -729,13 +735,15 @@ errno_t sss_ncache_prepopulate(struct sss_nc_ctx *ncache,
             ret = sss_parse_name(tmpctx, dom->names, filter_list[i],
                                  &domainname, &name);
             if (ret != EOK) {
-                DEBUG(1, "Invalid name in filterGroups list: [%s] (%d)\n",
+                DEBUG(SSSDBG_CRIT_FAILURE,
+                      "Invalid name in filterGroups list: [%s] (%d)\n",
                          filter_list[i], ret);
                 continue;
             }
 
             if (domainname && strcmp(domainname, dom->name)) {
-                DEBUG(1, "Mismatch betwen domain name (%s) and name "
+                DEBUG(SSSDBG_CRIT_FAILURE,
+                      "Mismatch betwen domain name (%s) and name "
                           "set in FQN  (%s), skipping group %s\n",
                           dom->name, domainname, name);
                 continue;
@@ -743,7 +751,8 @@ errno_t sss_ncache_prepopulate(struct sss_nc_ctx *ncache,
 
             ret = sss_ncache_set_group(ncache, true, dom, name);
             if (ret != EOK) {
-                DEBUG(1, "Failed to store permanent group filter for [%s]"
+                DEBUG(SSSDBG_CRIT_FAILURE,
+                      "Failed to store permanent group filter for [%s]"
                           " (%d [%s])\n", filter_list[i],
                           ret, strerror(ret));
                 continue;
@@ -775,7 +784,8 @@ errno_t sss_ncache_prepopulate(struct sss_nc_ctx *ncache,
                                          rctx->default_domain, filter_list[i],
                                          &domainname, &name);
         if (ret != EOK) {
-            DEBUG(1, "Invalid name in filterGroups list: [%s] (%d)\n",
+            DEBUG(SSSDBG_CRIT_FAILURE,
+                  "Invalid name in filterGroups list: [%s] (%d)\n",
                      filter_list[i], ret);
             continue;
         }
@@ -789,7 +799,8 @@ errno_t sss_ncache_prepopulate(struct sss_nc_ctx *ncache,
 
             ret = sss_ncache_set_group(ncache, true, dom, name);
             if (ret != EOK) {
-                DEBUG(1, "Failed to store permanent group filter for"
+                DEBUG(SSSDBG_CRIT_FAILURE,
+                      "Failed to store permanent group filter for"
                           " [%s] (%d [%s])\n", filter_list[i],
                           ret, strerror(ret));
                 continue;
@@ -798,7 +809,8 @@ errno_t sss_ncache_prepopulate(struct sss_nc_ctx *ncache,
             for (dom = domain_list; dom; dom = get_next_domain(dom, false)) {
                 ret = sss_ncache_set_group(ncache, true, dom, name);
                 if (ret != EOK) {
-                   DEBUG(1, "Failed to store permanent group filter for"
+                   DEBUG(SSSDBG_CRIT_FAILURE,
+                         "Failed to store permanent group filter for"
                              " [%s:%s] (%d [%s])\n",
                              dom->name, filter_list[i],
                              ret, strerror(ret));