Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/miscutils/crontab.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/miscutils/crontab.c (modified) (3 diffs)

branches/3.3/mindi-busybox/miscutils/crontab.c

@@ -54 +54 @@
     BB_EXECLP(ptr, ptr, file, NULL);
     bb_perror_msg_and_die("can't execute '%s'", ptr);
-}
-
-static int open_as_user(const struct passwd *pas, const char *file)
-{
-    pid_t pid;
-    char c;
-
-    pid = xvfork();
-    if (pid) { /* PARENT */
-        if (wait4pid(pid) == 0) {
-            /* exitcode 0: child says it can read */
-            return open(file, O_RDONLY);
-        }
-        return -1;
-    }
-
-    /* CHILD */
-    /* initgroups, setgid, setuid */
-    change_identity(pas);
-    /* We just try to read one byte. If it works, file is readable
-     * under this user. We signal that by exiting with 0. */
-    _exit(safe_read(xopen(file, O_RDONLY), &c, 1) < 0);
 }
 
@@ -138 +116 @@
             bb_show_usage();
         if (NOT_LONE_DASH(argv[0])) {
-            src_fd = open_as_user(pas, argv[0]);
-            if (src_fd < 0)
-                bb_error_msg_and_die("user %s cannot read %s",
-                        pas->pw_name, argv[0]);
+            src_fd = xopen_as_uid_gid(argv[0], O_RDONLY, pas->pw_uid, pas->pw_gid);
         }
     }
@@ -196 +171 @@
         /*free(tmp_fname);*/
         /*free(new_fname);*/
-
     } /* switch */