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.163 by root, Fri Jan 6 02:11:15 2006 UTC vs.
Revision 1.167 by root, Sun Jan 8 08:43:11 2006 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
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 ();
… …
487 if (OPTION (Opt_scrollBar)) 495 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 496 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 497#endif
490 498
491#if ENABLE_PERL 499#if ENABLE_PERL
500 if (!rs[Rs_perl_ext_1])
501 rs[Rs_perl_ext_1] = "default";
502
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 503 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 504 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 505 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 { 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
496 rxvt_perl.init (); 524 rxvt_perl.init (tainted);
497 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 525 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
498 } 526 }
499#endif 527#endif
500 528
501 create_windows (argc, argv); 529 create_windows (argc, argv);
… …
610 /* signal (SIGURG, SIG_DFL); */ 638 /* signal (SIGURG, SIG_DFL); */
611 639
612 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 640 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
613 // TODO: handle this with exceptions and tolerate the memory loss 641 // TODO: handle this with exceptions and tolerate the memory loss
614 XSetIOErrorHandler (rxvt_xioerror_handler); 642 XSetIOErrorHandler (rxvt_xioerror_handler);
643
644#ifdef USE_XGETDEFAULT
645 XrmInitialize ();
646#endif
615} 647}
616 648
617/* ------------------------------------------------------------------------- * 649/* ------------------------------------------------------------------------- *
618 * MEMORY ALLOCATION WRAPPERS * 650 * MEMORY ALLOCATION WRAPPERS *
619 * ------------------------------------------------------------------------- */ 651 * ------------------------------------------------------------------------- */
… …
655 * ------------------------------------------------------------------------- */ 687 * ------------------------------------------------------------------------- */
656/* take care of suid/sgid super-user (root) privileges */ 688/* take care of suid/sgid super-user (root) privileges */
657void 689void
658rxvt_privileges (rxvt_privaction action) 690rxvt_privileges (rxvt_privaction action)
659{ 691{
660#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
661 static uid_t euid;
662 static gid_t egid;
663#endif
664
665#if ! defined(__CYGWIN32__) 692#if ! defined(__CYGWIN32__)
666# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 693# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
667 /* setreuid () is the poor man's setuid (), seteuid () */ 694 /* setreuid () is the poor man's setuid (), seteuid () */
668# define seteuid(a) setreuid(-1, (a)) 695# define seteuid(a) setreuid(-1, (a))
669# define setegid(a) setregid(-1, (a)) 696# define setegid(a) setregid(-1, (a))
… …
679 */ 706 */
680 seteuid (getuid ()); 707 seteuid (getuid ());
681 setegid (getgid ()); 708 setegid (getgid ());
682 break; 709 break;
683 case SAVE: 710 case SAVE:
684 euid = geteuid (); 711 saved_euid = geteuid ();
685 egid = getegid (); 712 saved_egid = getegid ();
686 break; 713 break;
687 case RESTORE: 714 case RESTORE:
688 seteuid (euid); 715 seteuid (saved_euid);
689 setegid (egid); 716 setegid (saved_egid);
690 break; 717 break;
691 } 718 }
692# else 719# else
693 switch (action) 720 switch (action)
694 { 721 {

Diff Legend

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