From 7486dea9f5f7b2a6fbbacc6db740a82140b6377c Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn@redhat.com>
Date: Fri, 17 May 2013 17:36:38 +0200
Subject: Fixing critical format string issues.

--missing arguments.
--format '%s', but argument is integer.
--wrong format string, examle: '%\n'
---
 src/tools/files.c         | 6 +++---
 src/tools/sss_seed.c      | 2 +-
 src/tools/sss_userdel.c   | 6 ++++--
 src/tools/tools_mc_util.c | 3 ++-
 src/tools/tools_util.c    | 3 ++-
 5 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/files.c b/src/tools/files.c
index 186f18b9b..1c1b08558 100644
--- a/src/tools/files.c
+++ b/src/tools/files.c
@@ -208,7 +208,7 @@ static int remove_tree_with_ctx(TALLOC_CTX *mem_ctx,
             if (parent_dev && parent_dev != statres.st_dev) {
                 DEBUG(SSSDBG_CRIT_FAILURE,
                       ("Directory %s is on different filesystem, "
-                       "will not follow\n"));
+                       "will not follow\n", result->d_name));
                 ret = EFAULT;
                 goto fail;
             }
@@ -588,8 +588,8 @@ copy_entry(struct copy_ctx *cctx,
                        &st);
         if (ret != EOK) {
             DEBUG(SSSDBG_OP_FAILURE,
-                    ("Could recursively copy '%s' to '%s': %s\n",
-                    src_ent_path, dest_dir_fd, strerror(ret)));
+                    ("Couldn't recursively copy '%s' to '%s': %s\n",
+                    src_ent_path, dest_ent_path, strerror(ret)));
             goto done;
         }
     } else if (S_ISREG(st.st_mode)) {
diff --git a/src/tools/sss_seed.c b/src/tools/sss_seed.c
index 846a44723..75f7e8c52 100644
--- a/src/tools/sss_seed.c
+++ b/src/tools/sss_seed.c
@@ -789,7 +789,7 @@ int main(int argc, const char **argv)
     /* initialize seed context and parse options */
     ret = seed_init(sctx, argc, argv, &sctx);
     if (ret != EOK) {
-        DEBUG(SSSDBG_OP_FAILURE,("Seed init failed [%d][%d]\n",
+        DEBUG(SSSDBG_OP_FAILURE,("Seed init failed [%d][%s]\n",
                                  ret, strerror(ret)));
         goto done;
     }
diff --git a/src/tools/sss_userdel.c b/src/tools/sss_userdel.c
index ac87a7360..d61a45711 100644
--- a/src/tools/sss_userdel.c
+++ b/src/tools/sss_userdel.c
@@ -96,8 +96,10 @@ static int kick_user(struct tools_ctx *tctx)
     } else {
         /* parent */
         if (pid == -1) {
-            DEBUG(1, ("fork failed [%d]: %s\n"));
-            return errno;
+            ret = errno;
+            DEBUG(SSSDBG_CRIT_FAILURE,
+                  ("fork failed [%d]: %s\n", ret, strerror(ret)));
+            return ret;
         }
 
         while((child_pid = waitpid(pid, &status, 0)) > 0) {
diff --git a/src/tools/tools_mc_util.c b/src/tools/tools_mc_util.c
index b563fac3c..33d5d26db 100644
--- a/src/tools/tools_mc_util.c
+++ b/src/tools/tools_mc_util.c
@@ -117,7 +117,8 @@ done:
             if (pret == -1) {
                 DEBUG(SSSDBG_MINOR_FAILURE,
                       ("Failed to unlink file %s. "
-                       "Will be unlinked later by sssd_nss.\n"));
+                       "Will be unlinked later by sssd_nss.\n",
+                       mc_filename));
             }
         }
     }
diff --git a/src/tools/tools_util.c b/src/tools/tools_util.c
index 1ad5326e3..6798b6589 100644
--- a/src/tools/tools_util.c
+++ b/src/tools/tools_util.c
@@ -532,8 +532,9 @@ int run_userdel_cmd(struct tools_ctx *tctx)
     } else {
         /* parent */
         if (pid == -1) {
-            DEBUG(1, ("fork failed [%d]: %s\n"));
             ret = errno;
+            DEBUG(SSSDBG_CRIT_FAILURE,
+                  ("fork failed [%d]: %s\n", ret, strerror(ret)));
             goto done;
         }
 
-- 
cgit