ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.165 by root, Sun Jan 8 00:20:12 2006 UTC vs.
Revision 1.167 by root, Sun Jan 8 08:43:11 2006 UTC

… …
46 46
47#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
52static uid_t saved_euid;
53static gid_t saved_egid;
54#endif
55
51vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
52 57
53static char curlocale[128], savelocale[128]; 58static char curlocale[128], savelocale[128];
54 59
55bool 60bool
… …
273 // TODO: free pixcolours, colours should become part of rxvt_display 278 // TODO: free pixcolours, colours should become part of rxvt_display
274 279
275 delete pix_colors_focused; 280 delete pix_colors_focused;
276#if OFF_FOCUS_FADING 281#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 282 delete pix_colors_unfocused;
283#endif
284#if USE_XGETDEFAULT
285 XrmDestroyDatabase (xrmdatabase);
278#endif 286#endif
279 287
280 displays.put (display); 288 displays.put (display);
281 289
282 scr_release (); 290 scr_release ();
… …
494 502
495 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 503 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
496 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 504 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
497 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 505 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
498 { 506 {
507 bool tainted = false;
508
509#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
510 // ignore some perl-related arguments if some bozo installed us set[ug]id
511 if (getuid () != saved_euid || getgid () != saved_egid)
512 {
513 tainted = true;
514
515 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
516 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
517 {
518 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
519 rs[Rs_perl_lib] = 0;
520 rs[Rs_perl_eval] = "our $tainted = 1";
521 }
522 }
523#endif
499 rxvt_perl.init (); 524 rxvt_perl.init (tainted);
500 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 525 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
501 } 526 }
502#endif 527#endif
503 528
504 create_windows (argc, argv); 529 create_windows (argc, argv);
… …
613 /* signal (SIGURG, SIG_DFL); */ 638 /* signal (SIGURG, SIG_DFL); */
614 639
615 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 640 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
616 // TODO: handle this with exceptions and tolerate the memory loss 641 // TODO: handle this with exceptions and tolerate the memory loss
617 XSetIOErrorHandler (rxvt_xioerror_handler); 642 XSetIOErrorHandler (rxvt_xioerror_handler);
643
644#ifdef USE_XGETDEFAULT
645 XrmInitialize ();
646#endif
618} 647}
619 648
620/* ------------------------------------------------------------------------- * 649/* ------------------------------------------------------------------------- *
621 * MEMORY ALLOCATION WRAPPERS * 650 * MEMORY ALLOCATION WRAPPERS *
622 * ------------------------------------------------------------------------- */ 651 * ------------------------------------------------------------------------- */
… …
658 * ------------------------------------------------------------------------- */ 687 * ------------------------------------------------------------------------- */
659/* take care of suid/sgid super-user (root) privileges */ 688/* take care of suid/sgid super-user (root) privileges */
660void 689void
661rxvt_privileges (rxvt_privaction action) 690rxvt_privileges (rxvt_privaction action)
662{ 691{
663#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
664 static uid_t euid;
665 static gid_t egid;
666#endif
667
668#if ! defined(__CYGWIN32__) 692#if ! defined(__CYGWIN32__)
669# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 693# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
670 /* setreuid () is the poor man's setuid (), seteuid () */ 694 /* setreuid () is the poor man's setuid (), seteuid () */
671# define seteuid(a) setreuid(-1, (a)) 695# define seteuid(a) setreuid(-1, (a))
672# define setegid(a) setregid(-1, (a)) 696# define setegid(a) setregid(-1, (a))
… …
682 */ 706 */
683 seteuid (getuid ()); 707 seteuid (getuid ());
684 setegid (getgid ()); 708 setegid (getgid ());
685 break; 709 break;
686 case SAVE: 710 case SAVE:
687 euid = geteuid (); 711 saved_euid = geteuid ();
688 egid = getegid (); 712 saved_egid = getegid ();
689 break; 713 break;
690 case RESTORE: 714 case RESTORE:
691 seteuid (euid); 715 seteuid (saved_euid);
692 setegid (egid); 716 setegid (saved_egid);
693 break; 717 break;
694 } 718 }
695# else 719# else
696 switch (action) 720 switch (action)
697 { 721 {

Diff Legend

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