diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2016-11-11 15:58:36 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2020-07-14 15:52:36 +0200 |
| commit | ee39510f6500b80fa917f51281faca35658c8f42 (patch) | |
| tree | f9b77b5de24e205b7612f70dfb55d7d642e6778f | |
| parent | fab7396000b63deab909b16b76b4e32df2f3f825 (diff) | |
Xsession cleanup: - remove mkstemp conditional it's always there - remove USE_XPM conditional - remove SCO and Unixware bits that survived so far
| -rw-r--r-- | config/Makefile.am | 8 | ||||
| -rw-r--r-- | config/Xsession.cpp | 39 | ||||
| -rw-r--r-- | configure.ac | 6 |
3 files changed, 2 insertions, 51 deletions
diff --git a/config/Makefile.am b/config/Makefile.am index 88f391d..f714131 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -34,14 +34,8 @@ EXTRA_DIST = Xservers.cpp \ # Defines used when cpp'ing config files to replace settings in the files -#if USE_XPM XPMDEFINES = -DXPM -DBITMAPDIR=$(XENODM_PIXMAPDIR) -DXENODM_PIXMAP=$(XENODM_PIXMAP) \ -DXENODM_BWPIXMAP=$(XENODM_BWPIXMAP) -#endif - -#if HAVE_MKTEMP_COMMAND -MKTEMP_DEFINES = -DMKTEMP_COMMAND=$(MKTEMP_COMMAND) -#endif CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \ -DUTMP_FILE="$(UTMP_FILE)" -DWTMP_FILE="$(WTMP_FILE)" \ @@ -49,7 +43,7 @@ CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \ -DXENODMXAUTHDIR="$(XENODMXAUTHDIR)" \ -DXENODMCONFIGDIR="$(XENODMCONFIGDIR)" \ -DXENODMSCRIPTDIR="$(XENODMSCRIPTDIR)" -DSU="$(SU)" \ - $(XPMDEFINES) -DSHELL_CMD="$(SHELL_CMD)" $(MKTEMP_DEFINES) + $(XPMDEFINES) -DSHELL_CMD="$(SHELL_CMD)" Xservers: $(srcdir)/Xservers.cpp $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/Xservers.cpp | $(CPP_SED_MAGIC) > $@ diff --git a/config/Xsession.cpp b/config/Xsession.cpp index 05bc1f5..81c99ba 100644 --- a/config/Xsession.cpp +++ b/config/Xsession.cpp @@ -9,34 +9,15 @@ if ( umask 077 && cp /dev/null "$errfile" 2> /dev/null ) then exec > "$errfile" 2>&1 else -#ifdef MKTEMP_COMMAND - mktemp=MKTEMP_COMMAND for errfile in "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" do - if ef="$( umask 077 && $mktemp "$errfile.XXXXXX" 2> /dev/null)" + if ef="$( umask 077 && mktemp "$errfile.XXXXXX" 2> /dev/null)" then exec > "$ef" 2>&1 mv "$ef" "$errfile" 2> /dev/null break fi done -#else -XCOMM Since this system doesn't have a mktemp command to allow secure -XCOMM creation of files in shared directories, no fallback error log -XCOMM is being used. See https://bugs.freedesktop.org/show_bug.cgi?id=5898 -XCOMM -XCOMM for errfile in "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" -XCOMM do -XCOMM if ( umask 077 && cp /dev/null "$errfile" 2> /dev/null ) -XCOMM then -XCOMM exec > "$errfile" 2>&1 -XCOMM break -XCOMM fi -XCOMM done - - exec > /dev/null 2>&1 - -#endif fi XCOMM if we have private ssh key(s), start ssh-agent and add the key(s) @@ -87,24 +68,6 @@ else if [ -f "$resources" ]; then BINDIR/xrdb -load "$resources" fi -#if defined(__SCO__) || defined(__UNIXWARE__) - [ -r /etc/default/xdesktops ] && { - . /etc/default/xdesktops - } - - [ -r /etc/default/xenodm ] && { - . /etc/default/xenodm - } - - XCOMM Allow the user to over-ride the system default desktop - [ -r $HOME/.xenodmdesktop ] && { - . $HOME/.xenodmdesktop - } - - [ -n "$XDESKTOP" ] && { - exec `eval $XDESKTOP` - } -#endif BINDIR/xterm & BINDIR/fvwm fi diff --git a/configure.ac b/configure.ac index 40b1938..0d791d9 100644 --- a/configure.ac +++ b/configure.ac @@ -45,12 +45,6 @@ XORG_DEFAULT_OPTIONS XORG_PROG_RAWCPP XORG_WITH_LINT -# Checks for programs. -# Check for mktemp to prevent security issue noted in Xorg bug #5898 -# See https://bugs.freedesktop.org/show_bug.cgi?id=5898 for details. -AC_PATH_PROG(MKTEMP_COMMAND, mktemp) -AM_CONDITIONAL(HAVE_MKTEMP_COMMAND, test x$MKTEMP_COMMAND != x) - # Checks for typedefs, structures, and compiler characteristics. AC_TYPE_SIGNAL |