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, 22 insertions, 17 deletions

diff --git a/src/tools/sss_sync_ops.c b/src/tools/sss_sync_ops.c
index 57334295..b4366d7a 100644
--- a/src/tools/sss_sync_ops.c
+++ b/src/tools/sss_sync_ops.c
@@ -38,7 +38,7 @@
 
 #define VAR_CHECK(var, val, attr, msg) do { \
         if (var != (val)) { \
-            DEBUG(1, msg" attribute: %s", attr); \
+            DEBUG(SSSDBG_CRIT_FAILURE, msg" attribute: %s", attr); \
             return val; \
         } \
 } while(0)
@@ -364,7 +364,7 @@ int useradd_defaults(TALLOC_CTX *mem_ctx,
         ret = ENOMEM;
         goto done;
     }
-    DEBUG(7, "Gecos: %s\n", data->gecos);
+    DEBUG(SSSDBG_TRACE_LIBS, "Gecos: %s\n", data->gecos);
 
     /* homedir */
     if (homedir) {
@@ -382,7 +382,7 @@ int useradd_defaults(TALLOC_CTX *mem_ctx,
         ret = ENOMEM;
         goto done;
     }
-    DEBUG(7, "Homedir: %s\n", data->home);
+    DEBUG(SSSDBG_TRACE_LIBS, "Homedir: %s\n", data->home);
 
     /* default shell */
     if (!shell) {
@@ -399,7 +399,7 @@ int useradd_defaults(TALLOC_CTX *mem_ctx,
             goto done;
         }
     }
-    DEBUG(7, "Shell: %s\n", data->shell);
+    DEBUG(SSSDBG_TRACE_LIBS, "Shell: %s\n", data->shell);
 
     /* create homedir on user creation? */
     if (!create_home) {
@@ -412,7 +412,8 @@ int useradd_defaults(TALLOC_CTX *mem_ctx,
     } else {
         data->create_homedir = (create_home == DO_CREATE_HOME);
     }
-    DEBUG(7, "Auto create homedir: %s\n", data->create_homedir?"True":"False");
+    DEBUG(SSSDBG_TRACE_LIBS,
+          "Auto create homedir: %s\n", data->create_homedir?"True":"False");
 
     /* umask to create homedirs */
     ret = confdb_get_int(confdb,
@@ -421,7 +422,7 @@ int useradd_defaults(TALLOC_CTX *mem_ctx,
     if (ret != EOK) {
         goto done;
     }
-    DEBUG(7, "Umask: %o\n", data->umask);
+    DEBUG(SSSDBG_TRACE_LIBS, "Umask: %o\n", data->umask);
 
     /* a directory to create mail spools in */
     ret = confdb_get_string(confdb, mem_ctx,
@@ -430,7 +431,7 @@ int useradd_defaults(TALLOC_CTX *mem_ctx,
     if (ret != EOK) {
         goto done;
     }
-    DEBUG(7, "Mail dir: %s\n", data->maildir);
+    DEBUG(SSSDBG_TRACE_LIBS, "Mail dir: %s\n", data->maildir);
 
     /* skeleton dir */
     if (!skeldir) {
@@ -447,7 +448,7 @@ int useradd_defaults(TALLOC_CTX *mem_ctx,
             goto done;
         }
     }
-    DEBUG(7, "Skeleton dir: %s\n", data->skeldir);
+    DEBUG(SSSDBG_TRACE_LIBS, "Skeleton dir: %s\n", data->skeldir);
 
     ret = EOK;
 done:
@@ -505,13 +506,14 @@ int userdel(TALLOC_CTX *mem_ctx,
 
     user_dn = sysdb_user_dn(mem_ctx, data->domain, data->name);
     if (!user_dn) {
-        DEBUG(1, "Could not construct a user DN\n");
+        DEBUG(SSSDBG_CRIT_FAILURE, "Could not construct a user DN\n");
         return ENOMEM;
     }
 
     ret = sysdb_delete_entry(sysdb, user_dn, false);
     if (ret) {
-        DEBUG(2, "Removing user failed: %s (%d)\n", strerror(ret), ret);
+        DEBUG(SSSDBG_OP_FAILURE,
+              "Removing user failed: %s (%d)\n", strerror(ret), ret);
     }
 
     flush_nscd_cache(NSCD_DB_PASSWD);
@@ -546,13 +548,14 @@ int groupdel(TALLOC_CTX *mem_ctx,
 
     group_dn = sysdb_group_dn(mem_ctx, data->domain, data->name);
     if (group_dn == NULL) {
-        DEBUG(1, "Could not construct a group DN\n");
+        DEBUG(SSSDBG_CRIT_FAILURE, "Could not construct a group DN\n");
         return ENOMEM;
     }
 
     ret = sysdb_delete_entry(sysdb, group_dn, false);
     if (ret) {
-        DEBUG(2, "Removing group failed: %s (%d)\n", strerror(ret), ret);
+        DEBUG(SSSDBG_OP_FAILURE,
+              "Removing group failed: %s (%d)\n", strerror(ret), ret);
     }
 
     flush_nscd_cache(NSCD_DB_GROUP);
@@ -578,7 +581,7 @@ int sysdb_getpwnam_sync(TALLOC_CTX *mem_ctx,
 
     switch (res->count) {
     case 0:
-        DEBUG(1, "No result for sysdb_getpwnam call\n");
+        DEBUG(SSSDBG_CRIT_FAILURE, "No result for sysdb_getpwnam call\n");
         return ENOENT;
 
     case 1:
@@ -620,7 +623,7 @@ int sysdb_getpwnam_sync(TALLOC_CTX *mem_ctx,
             } else if (strcasecmp(str, "false") == 0) {
                 out->lock = DO_UNLOCK;
             } else { /* Invalid value */
-                DEBUG(2, "Invalid value for %s attribute: %s\n",
+                DEBUG(SSSDBG_OP_FAILURE, "Invalid value for %s attribute: %s\n",
                           SYSDB_DISABLED, str ? str : "NULL");
                 return EIO;
             }
@@ -628,7 +631,8 @@ int sysdb_getpwnam_sync(TALLOC_CTX *mem_ctx,
         break;
 
     default:
-        DEBUG(1, "More than one result for sysdb_getpwnam call\n");
+        DEBUG(SSSDBG_CRIT_FAILURE,
+              "More than one result for sysdb_getpwnam call\n");
         return EIO;
     }
 
@@ -650,7 +654,7 @@ int sysdb_getgrnam_sync(TALLOC_CTX *mem_ctx,
 
     switch (res->count) {
     case 0:
-        DEBUG(1, "No result for sysdb_getgrnam call\n");
+        DEBUG(SSSDBG_CRIT_FAILURE, "No result for sysdb_getgrnam call\n");
         return ENOENT;
 
     case 1:
@@ -664,7 +668,8 @@ int sysdb_getgrnam_sync(TALLOC_CTX *mem_ctx,
         break;
 
     default:
-        DEBUG(1, "More than one result for sysdb_getgrnam call\n");
+        DEBUG(SSSDBG_CRIT_FAILURE,
+              "More than one result for sysdb_getgrnam call\n");
         return EIO;
     }