Fri Feb 24 16:58:43 2006 Michael Jennings (mej)

Add fallback attempt to open display in case NEED_LINUX_HACK is set
and shouldn't be.
----------------------------------------------------------------------


SVN revision: 20766
This commit is contained in:
Michael Jennings 2006-02-24 21:58:58 +00:00
parent 7537403997
commit e7117e77bf
2 changed files with 7 additions and 3 deletions

View File

@ -5476,3 +5476,8 @@ Mon Feb 13 14:51:56 2006 Michael Jennings (mej)
Update to libast 0.6+ API.
----------------------------------------------------------------------
Fri Feb 24 16:58:43 2006 Michael Jennings (mej)
Add fallback attempt to open display in case NEED_LINUX_HACK is set
and shouldn't be.
----------------------------------------------------------------------

View File

@ -73,7 +73,6 @@ Atom props[NUM_PROPS];
int
eterm_bootstrap(int argc, char *argv[])
{
int i;
char *val;
@ -81,7 +80,7 @@ eterm_bootstrap(int argc, char *argv[])
static char windowid_string[20], *display_string, *term_string;
orig_argv0 = argv[0];
/* Security enhancements -- mej */
putenv("IFS= \t\n");
my_ruid = getuid();
@ -116,7 +115,7 @@ eterm_bootstrap(int argc, char *argv[])
#ifdef NEED_LINUX_HACK
privileges(REVERT);
#endif
if (!Xdisplay) {
if (!Xdisplay && !(Xdisplay = XOpenDisplay(display_name))) {
libast_print_error("can't open display %s\n", display_name);
exit(EXIT_FAILURE);
}