Changeset 1644 in MondoRescue for branches/2.2.5/mondo/src/common/libmondo-archive.c

Timestamp:

Sep 23, 2007, 2:41:29 AM (17 years ago)

Author:

Bruno Cornec

Message:

Apply patch from Andree Leidenfrost, modified a bit to use bkpinfo->tmpdir instead of /tmp
or MINDI_CACHE when appropriate. Fix security issues in mondo
Thanks al ot Andree for catching all those issues.
Will not compile needs more work as bkpinfo->tmpdir isn't available everywhere
Should become a global in 3.x when only containing pointers.

File:

• branches/2.2.5/mondo/src/common/libmondo-archive.c (modified) (5 diffs)

branches/2.2.5/mondo/src/common/libmondo-archive.c

@@ -1474 +1474 @@
     }
 /* if not Debian then go ahead & use fdformat */
-    strcpy(tempfile,
-           call_program_and_get_last_line_of_output
-           ("mktemp -q /tmp/mondo.XXXXXXXX"));
+    sprintf(tempfile, "%s/mondo.floppy.log", bkpinfo->tmpdir);
     sprintf(command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile, tempfile,
             tempfile);
@@ -3195 +3193 @@
     }
     log_to_screen("Scanning CD-ROM drive...");
-    sprintf(mtpt, "/tmp/cd.mtpt.%ld.%ld", (long int) random(),
-            (long int) random());
+    sprintf(mtpt, "%s/cd.mtpt", bkpinfo->tmpdir);
     make_hole_for_dir(mtpt);
 
@@ -3959 +3956 @@
         log_msg(2,
                 "Not verifying again. Per-CD/ISO verification already carried out.");
-        paranoid_system
-            ("cat /tmp/changed.files.* > /tmp/changed.files 2> /dev/null");
+        sprintf(tmp, "cat %s/changed.files > %s/changed.files 2> /dev/null",bkpinfo->tmpdir, MINDI_CACHE);
+        paranoid_system(tmp);
     } else {
         g_current_media_number = cdno;
@@ -3996 +3993 @@
 */
         sprintf(tmp,
-                "grep 'afio: ' %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> /tmp/changed.files",
-                MONDO_LOGFILE);
+                "grep 'afio: ' %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s/changed.files",
+                MONDO_LOGFILE, MINDI_CACHE);
         system(tmp);
 
         sprintf(tmp,
-                "grep 'star: ' %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> /tmp/changed.files",
-                MONDO_LOGFILE);
+                "grep 'star: ' %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s/changed.files",
+                MONDO_LOGFILE, MINDI_CACHE);
         system(tmp);
         run_program_and_log_output("umount " MNT_CDROM, FALSE);
@@ -4010 +4007 @@
 //}
     }
-    diffs = count_lines_in_file("/tmp/changed.files");
+    sprintf(tmp, "%s/changed.files", MINDI_CACHE);
+    diffs = count_lines_in_file(tmp);
 
     if (diffs > 0) {