Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/login.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/login.c (modified) (8 diffs)

branches/2.2.9/mindi-busybox/libbb/login.c

@@ -7 +7 @@
  * Optimize and correcting OCRNL by Vladimir Oleynik <dzo@simtreas.ru>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
-#include <sys/param.h>  /* MAXHOSTNAMELEN */
+#include "libbb.h"
+/* After libbb.h, since it needs sys/types.h on some systems */
 #include <sys/utsname.h>
-#include "libbb.h"
 
 #define LOGIN " login: "
@@ -19 +19 @@
 static const char fmtstr_t[] ALIGN1 = "%H:%M:%S";
 
-void print_login_issue(const char *issue_file, const char *tty)
+void FAST_FUNC print_login_issue(const char *issue_file, const char *tty)
 {
-    FILE *fd;
+    FILE *fp;
     int c;
     char buf[256+1];
@@ -31 +31 @@
     uname(&uts);
 
-    puts("\r"); /* start a new line */
+    puts("\r");  /* start a new line */
 
-    fd = fopen(issue_file, "r");
-    if (!fd)
+    fp = fopen_for_read(issue_file);
+    if (!fp)
         return;
-    while ((c = fgetc(fd)) != EOF) {
+    while ((c = fgetc(fp)) != EOF) {
         outbuf = buf;
         buf[0] = c;
@@ -45 +45 @@
         }
         if (c == '\\' || c == '%') {
-            c = fgetc(fd);
+            c = fgetc(fp);
             switch (c) {
             case 's':
@@ -51 +51 @@
                 break;
             case 'n':
+            case 'h':
                 outbuf = uts.nodename;
                 break;
@@ -62 +63 @@
                 outbuf = uts.machine;
                 break;
+/* The field domainname of struct utsname is Linux specific. */
+#if defined(__linux__)
             case 'D':
             case 'o':
-                c = getdomainname(buf, sizeof(buf) - 1);
-                buf[c >= 0 ? c : 0] = '\0';
+                outbuf = uts.domainname;
                 break;
+#endif
             case 'd':
                 strftime(buf, sizeof(buf), fmtstr_d, localtime(&t));
@@ -72 +75 @@
             case 't':
                 strftime(buf, sizeof(buf), fmtstr_t, localtime(&t));
-                break;
-            case 'h':
-                gethostname(buf, sizeof(buf) - 1);
-                buf[sizeof(buf) - 1] = '\0';
                 break;
             case 'l':
@@ -86 +85 @@
         fputs(outbuf, stdout);
     }
-    fclose(fd);
-    fflush(stdout);
+    fclose(fp);
+    fflush_all();
 }
 
-void print_login_prompt(void)
+void FAST_FUNC print_login_prompt(void)
 {
-    char buf[MAXHOSTNAMELEN+1];
+    char *hostname = safe_gethostname();
 
-    if (gethostname(buf, MAXHOSTNAMELEN) == 0)
-        fputs(buf, stdout);
+    fputs(hostname, stdout);
+    fputs(LOGIN, stdout);
+    fflush_all();
+    free(hostname);
+}
 
-    fputs(LOGIN, stdout);
-    fflush(stdout);
+/* Clear dangerous stuff, set PATH */
+static const char forbid[] ALIGN1 =
+    "ENV" "\0"
+    "BASH_ENV" "\0"
+    "HOME" "\0"
+    "IFS" "\0"
+    "SHELL" "\0"
+    "LD_LIBRARY_PATH" "\0"
+    "LD_PRELOAD" "\0"
+    "LD_TRACE_LOADED_OBJECTS" "\0"
+    "LD_BIND_NOW" "\0"
+    "LD_AOUT_LIBRARY_PATH" "\0"
+    "LD_AOUT_PRELOAD" "\0"
+    "LD_NOWARN" "\0"
+    "LD_KEEPDIR" "\0";
+
+int FAST_FUNC sanitize_env_if_suid(void)
+{
+    const char *p;
+
+    if (getuid() == geteuid())
+        return 0;
+
+    p = forbid;
+    do {
+        unsetenv(p);
+        p += strlen(p) + 1;
+    } while (*p);
+    putenv((char*)bb_PATH_root_path);
+
+    return 1; /* we indeed were run by different user! */
 }