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, 28 insertions, 19 deletions

diff --git a/src/tools/sss_groupshow.c b/src/tools/sss_groupshow.c
index 8689760d8..f7c798df6 100644
--- a/src/tools/sss_groupshow.c
+++ b/src/tools/sss_groupshow.c
@@ -80,7 +80,7 @@ static int parse_memberofs(struct ldb_context *ldb,
         if (gi->memberofs[i] == NULL) {
             return ENOMEM;
         }
-        DEBUG(6, "memberof value: %s\n", gi->memberofs[i]);
+        DEBUG(SSSDBG_TRACE_FUNC, "memberof value: %s\n", gi->memberofs[i]);
     }
     gi->memberofs[el->num_values] = NULL;
 
@@ -140,7 +140,7 @@ static int parse_members(TALLOC_CTX *mem_ctx,
                 ret = ENOMEM;
                 goto fail;
             }
-            DEBUG(6, "User member %s\n", um[um_index]);
+            DEBUG(SSSDBG_TRACE_FUNC, "User member %s\n", um[um_index]);
             um_index++;
         } else if (ldb_dn_compare_base(parent_dn, group_basedn) == 0) {
             gm[gm_index] = rdn_as_string(mem_ctx, dn);
@@ -149,14 +149,15 @@ static int parse_members(TALLOC_CTX *mem_ctx,
                 goto fail;
             }
             if (parent_name && strcmp(gm[gm_index], parent_name) == 0) {
-                DEBUG(6, "Skipping circular nesting for group %s\n",
+                DEBUG(SSSDBG_TRACE_FUNC,
+                      "Skipping circular nesting for group %s\n",
                           gm[gm_index]);
                 continue;
             }
-            DEBUG(6, "Group member %s\n", gm[gm_index]);
+            DEBUG(SSSDBG_TRACE_FUNC, "Group member %s\n", gm[gm_index]);
             gm_index++;
         } else {
-            DEBUG(2, "Group member not a user nor group: %s\n",
+            DEBUG(SSSDBG_OP_FAILURE, "Group member not a user nor group: %s\n",
                         ldb_dn_get_linearized(dn));
             ret = EIO;
             goto fail;
@@ -216,7 +217,8 @@ static int process_group(TALLOC_CTX *mem_ctx,
     struct group_info *gi = NULL;
     const char **user_members;
 
-    DEBUG(6, "Found entry %s\n", ldb_dn_get_linearized(msg->dn));
+    DEBUG(SSSDBG_TRACE_FUNC,
+          "Found entry %s\n", ldb_dn_get_linearized(msg->dn));
 
     gi = talloc_zero(mem_ctx, struct group_info);
     if (!gi) {
@@ -232,7 +234,7 @@ static int process_group(TALLOC_CTX *mem_ctx,
     gi->gid = ldb_msg_find_attr_as_uint64(msg,
                                           SYSDB_GIDNUM, 0);
     if (gi->gid == 0 || gi->name == NULL) {
-        DEBUG(3, "No name or no GID?\n");
+        DEBUG(SSSDBG_MINOR_FAILURE, "No name or no GID?\n");
         ret = EIO;
         goto done;
     }
@@ -334,7 +336,8 @@ int group_show(TALLOC_CTX *mem_ctx,
     /* First, search for the root group */
     ret = sysdb_search_group_by_name(mem_ctx, domain, name, attrs, &msg);
     if (ret) {
-        DEBUG(2, "Search failed: %s (%d)\n", strerror(ret), ret);
+        DEBUG(SSSDBG_OP_FAILURE,
+              "Search failed: %s (%d)\n", strerror(ret), ret);
         goto done;
     }
 
@@ -342,7 +345,7 @@ int group_show(TALLOC_CTX *mem_ctx,
                         msg, domain, NULL, &root,
                         &group_members, &nmembers);
     if (ret != EOK) {
-        DEBUG(2, "Group processing failed: %s (%d)\n",
+        DEBUG(SSSDBG_OP_FAILURE, "Group processing failed: %s (%d)\n",
                    strerror(ret), ret);
         goto done;
     }
@@ -392,7 +395,8 @@ int group_show(TALLOC_CTX *mem_ctx,
                              group_members, nmembers,
                              &root->group_members);
     if (ret) {
-        DEBUG(2, "Recursive search failed: %s (%d)\n", strerror(ret), ret);
+        DEBUG(SSSDBG_OP_FAILURE,
+              "Recursive search failed: %s (%d)\n", strerror(ret), ret);
         goto done;
     }
 
@@ -446,7 +450,7 @@ static int group_show_trim_memberof(TALLOC_CTX *mem_ctx,
             name = ldb_msg_find_attr_as_string(msgs[0],
                                                SYSDB_NAME, NULL);
             if (!name) {
-                DEBUG(2, "Entry %s has no Name Attribute ?!?\n",
+                DEBUG(SSSDBG_OP_FAILURE, "Entry %s has no Name Attribute ?!?\n",
                       ldb_dn_get_linearized(msgs[0]->dn));
                 return EFAULT;
             }
@@ -507,7 +511,8 @@ int group_show_recurse(TALLOC_CTX *mem_ctx,
         ret = sysdb_search_group_by_name(mem_ctx, domain, group_members[i],
                                          attrs, &msg);
         if (ret) {
-            DEBUG(2, "Search failed: %s (%d)\n", strerror(ret), ret);
+            DEBUG(SSSDBG_OP_FAILURE,
+                  "Search failed: %s (%d)\n", strerror(ret), ret);
             return EIO;
         }
 
@@ -515,7 +520,7 @@ int group_show_recurse(TALLOC_CTX *mem_ctx,
                             msg, domain, parent->name,
                             &groups[i], &new_group_members, &new_nmembers);
         if (ret != EOK) {
-            DEBUG(2, "Group processing failed: %s (%d)\n",
+            DEBUG(SSSDBG_OP_FAILURE, "Group processing failed: %s (%d)\n",
                       strerror(ret), ret);
             return ret;
         }
@@ -527,7 +532,7 @@ int group_show_recurse(TALLOC_CTX *mem_ctx,
                                      new_group_members, new_nmembers,
                                      &parent->group_members);
             if (ret != EOK) {
-                DEBUG(2, "Recursive search failed: %s (%d)\n",
+                DEBUG(SSSDBG_OP_FAILURE, "Recursive search failed: %s (%d)\n",
                           strerror(ret), ret);
                 return ret;
             }
@@ -559,7 +564,8 @@ static int group_show_mpg(TALLOC_CTX *mem_ctx,
 
     ret = sysdb_search_user_by_name(info, domain, name, attrs, &msg);
     if (ret) {
-        DEBUG(2, "Search failed: %s (%d)\n", strerror(ret), ret);
+        DEBUG(SSSDBG_OP_FAILURE,
+              "Search failed: %s (%d)\n", strerror(ret), ret);
         goto fail;
     }
 
@@ -568,7 +574,7 @@ static int group_show_mpg(TALLOC_CTX *mem_ctx,
                                                            SYSDB_NAME, NULL));
     info->gid = ldb_msg_find_attr_as_uint64(msg, SYSDB_UIDNUM, 0);
     if (info->gid == 0 || info->name == NULL) {
-        DEBUG(3, "No name or no GID?\n");
+        DEBUG(SSSDBG_MINOR_FAILURE, "No name or no GID?\n");
         ret = EIO;
         goto fail;
     }
@@ -656,7 +662,8 @@ int main(int argc, const char **argv)
 
     ret = set_locale();
     if (ret != EOK) {
-        DEBUG(1, "set_locale failed (%d): %s\n", ret, strerror(ret));
+        DEBUG(SSSDBG_CRIT_FAILURE,
+              "set_locale failed (%d): %s\n", ret, strerror(ret));
         ERROR("Error setting the locale\n");
         ret = EXIT_FAILURE;
         goto fini;
@@ -688,7 +695,8 @@ int main(int argc, const char **argv)
 
     ret = init_sss_tools(&tctx);
     if (ret != EOK) {
-        DEBUG(1, "init_sss_tools failed (%d): %s\n", ret, strerror(ret));
+        DEBUG(SSSDBG_CRIT_FAILURE,
+              "init_sss_tools failed (%d): %s\n", ret, strerror(ret));
         if (ret == ENOENT) {
             ERROR("Error initializing the tools - no local domain\n");
         } else {
@@ -716,7 +724,8 @@ int main(int argc, const char **argv)
 
     /* Process result */
     if (ret) {
-        DEBUG(1, "sysdb operation failed (%d)[%s]\n", ret, strerror(ret));
+        DEBUG(SSSDBG_CRIT_FAILURE,
+              "sysdb operation failed (%d)[%s]\n", ret, strerror(ret));
         switch (ret) {
             case ENOENT:
                 ERROR("No such group in local domain. "