Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/miscutils/wall.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/wall.c (modified) (3 diffs)

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

@@ -6 +6 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//config:config WALL
+//config:   bool "wall"
+//config:   default y
+//config:   depends on FEATURE_UTMP
+//config:   help
+//config:     Write a message to all users that are logged in.
+
+/* Needs to be run by root or be suid root - needs to write to /dev/TTY: */
+//applet:IF_WALL(APPLET(wall, BB_DIR_USR_BIN, BB_SUID_REQUIRE))
+
+//kbuild:lib-$(CONFIG_WALL) += wall.o
 
 //usage:#define wall_trivial_usage
@@ -21 +33 @@
 int wall_main(int argc UNUSED_PARAM, char **argv)
 {
-    struct utmp *ut;
+    struct utmpx *ut;
     char *msg;
-    int fd = argv[1] ? xopen(argv[1], O_RDONLY) : STDIN_FILENO;
+    int fd;
 
+    fd = STDIN_FILENO;
+    if (argv[1]) {
+        /* The applet is setuid.
+         * Access to the file must be under user's uid/gid.
+         */
+        fd = xopen_as_uid_gid(argv[1], O_RDONLY, getuid(), getgid());
+    }
     msg = xmalloc_read(fd, NULL);
     if (ENABLE_FEATURE_CLEAN_UP && argv[1])
         close(fd);
-    setutent();
-    while ((ut = getutent()) != NULL) {
+    setutxent();
+    while ((ut = getutxent()) != NULL) {
         char *line;
         if (ut->ut_type != USER_PROCESS)
@@ -38 +57 @@
     }
     if (ENABLE_FEATURE_CLEAN_UP) {
-        endutent();
+        endutxent();
         free(msg);
     }