[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.165 by root, Sun Jan 8 00:20:12 2006 UTC vs.
Revision 1.178 by root, Mon Jan 16 08:29:57 2006 UTC

 #ifdef HAVE_TERMIOS_H
 # include <termios.h>
 #endif
+#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
+static uid_t saved_euid;
+static gid_t saved_egid;
+#endif
+bool
+rxvt_tainted ()
+{
+#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
+  return getuid () != saved_euid || getgid () != saved_egid;
+#else
+  return false;
+#endif
+}
 vector<rxvt_term *> rxvt_term::termlist;
 static char curlocale[128], savelocale[128];
 bool
   strncpy (curlocale, locale, 128);
   setlocale (LC_CTYPE, curlocale);
   return true;
 }
-bool
+void
 rxvt_push_locale (const char *locale)
 {
   strcpy (savelocale, curlocale);
   rxvt_set_locale (locale);
 }
       if (parent[0])
         XDestroyWindow (disp, parent[0]);
     }
   // TODO: free pixcolours, colours should become part of rxvt_display
   delete pix_colors_focused;
 #if OFF_FOCUS_FADING
   delete pix_colors_unfocused;
 #endif
 }
 void
 rxvt_term::destroy_cb (time_watcher &w)
 {
-  SET_R (this);
+  make_current ();
   delete this;
 }
 /*----------------------------------------------------------------------*/
 /*----------------------------------------------------------------------*/
 bool
 rxvt_term::init (int argc, const char *const *argv)
 {
   SET_R (this);
   set_locale ("");
+  set_environ (envv); // few things in X do not call setlocale :(
   if (!init_vars ())
     return false;
   init_secondary ();
   if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
       || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
       || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
     {
+#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
+      // ignore some perl-related arguments if some bozo installed us set[ug]id
+      if (rxvt_tainted ())
+        {
+          if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
+              || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
+            {
+              rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
+              rs[Rs_perl_lib]  = 0;
+              rs[Rs_perl_eval] = 0;
+            }
+        }
+#endif
       rxvt_perl.init ();
+      setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
       HOOK_INVOKE ((this, HOOK_INIT, DT_END));
     }
 #endif
   create_windows (argc, argv);
   dDisp;
   init_xlocale ();
-  scr_reset ();         /* initialize screen */
+  scr_reset (); // initialize screen
 #if 0
   XSynchronize (disp, True);
 #endif
     sw_int  (this, &sig_handlers::sig_term)
   {
   }
 } sig_handlers;
+char **rxvt_environ; // startup environment
 void
 rxvt_init ()
 {
+  rxvt_environ = environ;
   /*
    * Save and then give up any super-user privileges
    * If we need privileges in any area then we must specifically request it.
    * We should only need to be root in these cases:
    *  1.  write utmp entries on some systems
   /* signal (SIGURG, SIG_DFL); */
   old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
   // TODO: handle this with exceptions and tolerate the memory loss
   XSetIOErrorHandler (rxvt_xioerror_handler);
+  XrmInitialize ();
 }
 /* ------------------------------------------------------------------------- *
  *                         MEMORY ALLOCATION WRAPPERS                        *
  * ------------------------------------------------------------------------- */
  * ------------------------------------------------------------------------- */
 /* take care of suid/sgid super-user (root) privileges */
 void
 rxvt_privileges (rxvt_privaction action)
 {
-#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
-  static uid_t euid;
-  static gid_t egid;
-#endif
 #if ! defined(__CYGWIN32__)
 # if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
   /* setreuid () is the poor man's setuid (), seteuid () */
 #  define seteuid(a)    setreuid(-1, (a))
 #  define setegid(a)    setregid(-1, (a))
       case IGNORE:
         /*
          * change effective uid/gid - not real uid/gid - so we can switch
          * back to root later, as required
          */
+        setegid (getgid ());
         seteuid (getuid ());
-        setegid (getgid ());
         break;
       case SAVE:
-        euid = geteuid ();
-        egid = getegid ();
+        saved_egid = getegid ();
+        saved_euid = geteuid ();
         break;
       case RESTORE:
-        seteuid (euid);
-        setegid (egid);
+        setegid (saved_egid);
+        seteuid (saved_euid);
         break;
     }
 # else
   switch (action)
     {
       case IGNORE:
+        setgid (getgid ());
         setuid (getuid ());
-        setgid (getgid ());
         /* FALLTHROUGH */
       case SAVE:
         /* FALLTHROUGH */
       case RESTORE:
         break;
   unsigned long fg, bg;
   const char *p;
   char **s;
   XIMStyles *xim_styles;
+  set_environ (envv);
   if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
     return false;
   D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
   input_method = display->get_xim (locale, modifiers);
   int i;
   const char *p;
   char **s;
   char buf[IMBUFSIZ];
-  SET_R (this);
+  make_current ();
   im_destroy ();
   D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
   if (Input_Context)

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.165 by root, Sun Jan 8 00:20:12 2006 UTC vs. Revision 1.178 by root, Mon Jan 16 08:29:57 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.165 by root, Sun Jan 8 00:20:12 2006 UTC vs.
Revision 1.178 by root, Mon Jan 16 08:29:57 2006 UTC