[w3m-dev 03379] setuid w3mimgdisplay and check console tty
* XMakefile: w3mimgdisplay install by INSTALL_W3MIMGDISPLAY * configure: ask setuid w3mimgdisplay (w3mimgdisplay_setuid): added (INSTALL_W3MIMGDISPLAY): added * etc.c (mySystem): close until FOPEN_MAX * image.c (openImgdisplay): setenv W3M_TTY stderr to /dev/null close until FOPEN_MAX * install-sh: -o, -g for owner, group * proto.h (ttyname_tty): added * search.c (open_migemo): stderr to /dev/null close until FOPEN_MAX * terms.c (ttyname_tty): added * w3mimgdisplay.c: include <sys/types.h>, <unistd.h> W3MIMGDISPLAY_SETUID stderr to /dev/null * w3mimg/w3mimg.c: include <sys/types.h>, <unistd.h> W3MIMGDISPLAY_SETUID * w3mimg/fb/fb_w3mimg.c (check_tty_console): added From: Fumitoshi UKAI <ukai@debian.or.jp>
This commit is contained in:
		@@ -1,18 +1,32 @@
 | 
			
		||||
/* $Id: w3mimg.c,v 1.4 2002/07/19 03:25:56 ukai Exp $ */
 | 
			
		||||
/* $Id: w3mimg.c,v 1.5 2002/11/06 03:50:49 ukai Exp $ */
 | 
			
		||||
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <stdlib.h>
 | 
			
		||||
#include <sys/types.h>
 | 
			
		||||
#include <unistd.h>
 | 
			
		||||
#include "w3mimg/w3mimg.h"
 | 
			
		||||
 | 
			
		||||
w3mimg_op *
 | 
			
		||||
w3mimg_open()
 | 
			
		||||
{
 | 
			
		||||
    w3mimg_op *w_op = NULL;
 | 
			
		||||
#ifdef W3MIMGDISPLAY_SETUID
 | 
			
		||||
    uid_t runner_uid = getuid();
 | 
			
		||||
    uid_t owner_uid = geteuid();
 | 
			
		||||
#endif
 | 
			
		||||
#ifdef USE_W3MIMG_X11
 | 
			
		||||
#ifdef W3MIMGDISPLAY_SETUID
 | 
			
		||||
    /* run in user privileges */
 | 
			
		||||
    setreuid(owner_uid, runner_uid);
 | 
			
		||||
#endif
 | 
			
		||||
    if (w_op == NULL)
 | 
			
		||||
	w_op = w3mimg_x11open();
 | 
			
		||||
#ifdef W3MIMGDISPLAY_SETUID
 | 
			
		||||
    setreuid(runner_uid, owner_uid);
 | 
			
		||||
#endif
 | 
			
		||||
#endif
 | 
			
		||||
#ifdef USE_W3MIMG_FB
 | 
			
		||||
    /* run in setuid privileges */
 | 
			
		||||
    if (w_op == NULL)
 | 
			
		||||
	w_op = w3mimg_fbopen();
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user