Author: dnusinow
Date: 2006-06-29 22:31:38 -0400 (Thu, 29 Jun 2006)
New Revision: 2354
Modified:
vendor/X11R7.1/app/xdm/ChangeLog
vendor/X11R7.1/app/xdm/README
vendor/X11R7.1/app/xdm/access.c
vendor/X11R7.1/app/xdm/aclocal.m4
vendor/X11R7.1/app/xdm/config/Xaccess
vendor/X11R7.1/app/xdm/config/xdm-config.cpp
vendor/X11R7.1/app/xdm/configure
vendor/X11R7.1/app/xdm/configure.ac
vendor/X11R7.1/app/xdm/dm.h
vendor/X11R7.1/app/xdm/genauth.c
vendor/X11R7.1/app/xdm/greeter/Makefile.am
vendor/X11R7.1/app/xdm/greeter/Makefile.in
vendor/X11R7.1/app/xdm/greeter/greet.c
vendor/X11R7.1/app/xdm/resource.c
vendor/X11R7.1/app/xdm/session.c
vendor/X11R7.1/app/xdm/xdmcp.c
vendor/X11R7.1/app/xdm/xdmshell.c
Log:
Vendor drop of xdm 1.0.5
Modified: vendor/X11R7.1/app/xdm/ChangeLog
===================================================================
--- vendor/X11R7.1/app/xdm/ChangeLog 2006-06-25 23:34:46 UTC (rev 2353)
+++ vendor/X11R7.1/app/xdm/ChangeLog 2006-06-30 02:31:38 UTC (rev 2354)
@@ -1,3 +1,13 @@
+2006-06-22 Alan Coopersmith <[EMAIL PROTECTED]>
+
+ * configure.ac:
+ Version bump: 1.0.5
+
+2006-06-20 Matthieu Herrb <[EMAIL PROTECTED]>
+ * session.c:
+ * xdmshell.c:
+ Check setuid() return value. Bugzilla #7116.
+
2006-04-27 Alan Coopersmith <[EMAIL PROTECTED]>
* configure.ac:
Modified: vendor/X11R7.1/app/xdm/README
===================================================================
--- vendor/X11R7.1/app/xdm/README 2006-06-25 23:34:46 UTC (rev 2353)
+++ vendor/X11R7.1/app/xdm/README 2006-06-30 02:31:38 UTC (rev 2354)
@@ -19,4 +19,4 @@
--with-xdmconfigdir=/etc/X11/xdm --with-xdmlibdir=$(prefix)/lib/xdm
--with-xdmscriptdir=/etc/X11/xdm
-$Id: README,v 1.3 2005/12/11 20:43:48 alanc Exp $
+$Id: README,v 1.2 2005/10/26 03:17:17 alanc Exp $
Modified: vendor/X11R7.1/app/xdm/access.c
===================================================================
--- vendor/X11R7.1/app/xdm/access.c 2006-06-25 23:34:46 UTC (rev 2353)
+++ vendor/X11R7.1/app/xdm/access.c 2006-06-30 02:31:38 UTC (rev 2354)
@@ -1,5 +1,5 @@
/*
- * $XdotOrg$
+ * $XdotOrg: app/xdm/access.c,v 1.2 2004/04/23 19:54:42 eich Exp $
* $Xorg: access.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $
*
Copyright 1990, 1998 The Open Group
Modified: vendor/X11R7.1/app/xdm/aclocal.m4
===================================================================
--- vendor/X11R7.1/app/xdm/aclocal.m4 2006-06-25 23:34:46 UTC (rev 2353)
+++ vendor/X11R7.1/app/xdm/aclocal.m4 2006-06-30 02:31:38 UTC (rev 2354)
@@ -1112,40 +1112,40 @@
if test x$APP_MAN_SUFFIX = x ; then
case $host_os in
- linux*) APP_MAN_SUFFIX=1x ;;
+ linux* | k*bsd*-gnu) APP_MAN_SUFFIX=1x ;;
*) APP_MAN_SUFFIX=1 ;;
esac
fi
if test x$APP_MAN_DIR = x ; then
case $host_os in
- linux*) APP_MAN_DIR='$(mandir)/man1' ;;
+ linux* | k*bsd*-gnu) APP_MAN_DIR='$(mandir)/man1' ;;
*) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
esac
fi
if test x$LIB_MAN_SUFFIX = x ; then
case $host_os in
- linux*) LIB_MAN_SUFFIX=3x ;;
+ linux* | k*bsd*-gnu) LIB_MAN_SUFFIX=3x ;;
*) LIB_MAN_SUFFIX=3 ;;
esac
fi
if test x$LIB_MAN_DIR = x ; then
case $host_os in
- linux*) LIB_MAN_DIR='$(mandir)/man3' ;;
+ linux* | k*bsd*-gnu) LIB_MAN_DIR='$(mandir)/man3' ;;
*) LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
esac
fi
if test x$FILE_MAN_SUFFIX = x ; then
case $host_os in
- linux*) FILE_MAN_SUFFIX=5x ;;
+ linux* | k*bsd*-gnu) FILE_MAN_SUFFIX=5x ;;
solaris*) FILE_MAN_SUFFIX=4 ;;
*) FILE_MAN_SUFFIX=5 ;;
esac
fi
if test x$FILE_MAN_DIR = x ; then
case $host_os in
- linux*) FILE_MAN_DIR='$(mandir)/man5' ;;
+ linux* | k*bsd*-gnu) FILE_MAN_DIR='$(mandir)/man5' ;;
*) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
esac
fi
@@ -1154,14 +1154,14 @@
# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$MISC_MAN_SUFFIX = x ; then
case $host_os in
-# linux*) MISC_MAN_SUFFIX=7x ;;
+# linux* | k*bsd*-gnu) MISC_MAN_SUFFIX=7x ;;
solaris*) MISC_MAN_SUFFIX=5 ;;
*) MISC_MAN_SUFFIX=7 ;;
esac
fi
if test x$MISC_MAN_DIR = x ; then
case $host_os in
-# linux*) MISC_MAN_DIR='$(mandir)/man7' ;;
+# linux* | k*bsd*-gnu) MISC_MAN_DIR='$(mandir)/man7' ;;
*) MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;;
esac
fi
@@ -1170,14 +1170,14 @@
# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$DRIVER_MAN_SUFFIX = x ; then
case $host_os in
-# linux*) DRIVER_MAN_SUFFIX=4x ;;
+# linux* | k*bsd*-gnu) DRIVER_MAN_SUFFIX=4x ;;
solaris*) DRIVER_MAN_SUFFIX=7 ;;
*) DRIVER_MAN_SUFFIX=4 ;;
esac
fi
if test x$DRIVER_MAN_DIR = x ; then
case $host_os in
-# linux*) DRIVER_MAN_DIR='$(mandir)/man4' ;;
+# linux* | k*bsd*-gnu) DRIVER_MAN_DIR='$(mandir)/man4' ;;
*) DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;;
esac
fi
Modified: vendor/X11R7.1/app/xdm/config/Xaccess
===================================================================
--- vendor/X11R7.1/app/xdm/config/Xaccess 2006-06-25 23:34:46 UTC (rev
2353)
+++ vendor/X11R7.1/app/xdm/config/Xaccess 2006-06-30 02:31:38 UTC (rev
2354)
@@ -1,4 +1,4 @@
-# $XdotOrg: Xaccess,v 1.3 2000/08/17 19:54:17 cpqbld Exp $
+# $XdotOrg: app/xdm/config/Xaccess,v 1.2 2004/04/23 19:54:43 eich Exp $
# $Xorg: Xaccess,v 1.3 2000/08/17 19:54:17 cpqbld Exp $
# $XFree86: xc/programs/xdm/config/Xaccess,v 1.4 2003/07/09 15:27:40 tsi Exp $
#
Modified: vendor/X11R7.1/app/xdm/config/xdm-config.cpp
===================================================================
--- vendor/X11R7.1/app/xdm/config/xdm-config.cpp 2006-06-25 23:34:46 UTC
(rev 2353)
+++ vendor/X11R7.1/app/xdm/config/xdm-config.cpp 2006-06-30 02:31:38 UTC
(rev 2354)
@@ -1,5 +1,5 @@
! $Xorg: xdm-conf.cpp,v 1.3 2000/08/17 19:54:17 cpqbld Exp $
-! $XdotOrg: $
+! $XdotOrg: app/xdm/config/xdm-config.cpp,v 1.5 2005/12/11 20:46:25 alanc Exp
$
!
!
!
Modified: vendor/X11R7.1/app/xdm/configure
===================================================================
--- vendor/X11R7.1/app/xdm/configure 2006-06-25 23:34:46 UTC (rev 2353)
+++ vendor/X11R7.1/app/xdm/configure 2006-06-30 02:31:38 UTC (rev 2354)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for xdm 1.0.4.
+# Generated by GNU Autoconf 2.59 for xdm 1.0.5.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='xdm'
PACKAGE_TARNAME='xdm'
-PACKAGE_VERSION='1.0.4'
-PACKAGE_STRING='xdm 1.0.4'
+PACKAGE_VERSION='1.0.5'
+PACKAGE_STRING='xdm 1.0.5'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
# Factoring default headers for most tests.
@@ -1037,7 +1037,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xdm 1.0.4 to adapt to many kinds of systems.
+\`configure' configures xdm 1.0.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1103,7 +1103,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xdm 1.0.4:";;
+ short | recursive ) echo "Configuration of xdm 1.0.5:";;
esac
cat <<\_ACEOF
@@ -1315,7 +1315,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-xdm configure 1.0.4
+xdm configure 1.0.5
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1329,7 +1329,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xdm $as_me 1.0.4, which was
+It was created by xdm $as_me 1.0.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1964,7 +1964,7 @@
# Define the identity of the package.
PACKAGE='xdm'
- VERSION='1.0.4'
+ VERSION='1.0.5'
cat >>confdefs.h <<_ACEOF
@@ -23845,40 +23845,40 @@
if test x$APP_MAN_SUFFIX = x ; then
case $host_os in
- linux*) APP_MAN_SUFFIX=1x ;;
+ linux* | k*bsd*-gnu) APP_MAN_SUFFIX=1x ;;
*) APP_MAN_SUFFIX=1 ;;
esac
fi
if test x$APP_MAN_DIR = x ; then
case $host_os in
- linux*) APP_MAN_DIR='$(mandir)/man1' ;;
+ linux* | k*bsd*-gnu) APP_MAN_DIR='$(mandir)/man1' ;;
*) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
esac
fi
if test x$LIB_MAN_SUFFIX = x ; then
case $host_os in
- linux*) LIB_MAN_SUFFIX=3x ;;
+ linux* | k*bsd*-gnu) LIB_MAN_SUFFIX=3x ;;
*) LIB_MAN_SUFFIX=3 ;;
esac
fi
if test x$LIB_MAN_DIR = x ; then
case $host_os in
- linux*) LIB_MAN_DIR='$(mandir)/man3' ;;
+ linux* | k*bsd*-gnu) LIB_MAN_DIR='$(mandir)/man3' ;;
*) LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
esac
fi
if test x$FILE_MAN_SUFFIX = x ; then
case $host_os in
- linux*) FILE_MAN_SUFFIX=5x ;;
+ linux* | k*bsd*-gnu) FILE_MAN_SUFFIX=5x ;;
solaris*) FILE_MAN_SUFFIX=4 ;;
*) FILE_MAN_SUFFIX=5 ;;
esac
fi
if test x$FILE_MAN_DIR = x ; then
case $host_os in
- linux*) FILE_MAN_DIR='$(mandir)/man5' ;;
+ linux* | k*bsd*-gnu) FILE_MAN_DIR='$(mandir)/man5' ;;
*) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
esac
fi
@@ -23887,14 +23887,14 @@
# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$MISC_MAN_SUFFIX = x ; then
case $host_os in
-# linux*) MISC_MAN_SUFFIX=7x ;;
+# linux* | k*bsd*-gnu) MISC_MAN_SUFFIX=7x ;;
solaris*) MISC_MAN_SUFFIX=5 ;;
*) MISC_MAN_SUFFIX=7 ;;
esac
fi
if test x$MISC_MAN_DIR = x ; then
case $host_os in
-# linux*) MISC_MAN_DIR='$(mandir)/man7' ;;
+# linux* | k*bsd*-gnu) MISC_MAN_DIR='$(mandir)/man7' ;;
*) MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;;
esac
fi
@@ -23903,14 +23903,14 @@
# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$DRIVER_MAN_SUFFIX = x ; then
case $host_os in
-# linux*) DRIVER_MAN_SUFFIX=4x ;;
+# linux* | k*bsd*-gnu) DRIVER_MAN_SUFFIX=4x ;;
solaris*) DRIVER_MAN_SUFFIX=7 ;;
*) DRIVER_MAN_SUFFIX=4 ;;
esac
fi
if test x$DRIVER_MAN_DIR = x ; then
case $host_os in
-# linux*) DRIVER_MAN_DIR='$(mandir)/man4' ;;
+# linux* | k*bsd*-gnu) DRIVER_MAN_DIR='$(mandir)/man4' ;;
*) DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;;
esac
fi
@@ -24403,7 +24403,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by xdm $as_me 1.0.4, which was
+This file was extended by xdm $as_me 1.0.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24466,7 +24466,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xdm config.status 1.0.4
+xdm config.status 1.0.5
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Modified: vendor/X11R7.1/app/xdm/configure.ac
===================================================================
--- vendor/X11R7.1/app/xdm/configure.ac 2006-06-25 23:34:46 UTC (rev 2353)
+++ vendor/X11R7.1/app/xdm/configure.ac 2006-06-30 02:31:38 UTC (rev 2354)
@@ -21,10 +21,10 @@
dnl
dnl Process this file with autoconf to create configure.
-dnl $XdotOrg: app/xdm/configure.ac,v 1.40 2006/04/27 21:21:15 alanc Exp $
+dnl $XdotOrg: app/xdm/configure.ac,v 1.40.2.1 2006/06/22 22:39:02 alanc Exp $
AC_PREREQ([2.57])
-AC_INIT(xdm,[1.0.4],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm)
+AC_INIT(xdm,[1.0.5],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
Modified: vendor/X11R7.1/app/xdm/dm.h
===================================================================
--- vendor/X11R7.1/app/xdm/dm.h 2006-06-25 23:34:46 UTC (rev 2353)
+++ vendor/X11R7.1/app/xdm/dm.h 2006-06-30 02:31:38 UTC (rev 2354)
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/xdm/dm.h,v 1.3 2004/12/15 20:49:08 herrb Exp $ */
+/* $XdotOrg: app/xdm/dm.h,v 1.5 2005/11/08 06:33:31 jkj Exp $ */
/* $Xorg: dm.h,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */
/*
Modified: vendor/X11R7.1/app/xdm/genauth.c
===================================================================
--- vendor/X11R7.1/app/xdm/genauth.c 2006-06-25 23:34:46 UTC (rev 2353)
+++ vendor/X11R7.1/app/xdm/genauth.c 2006-06-30 02:31:38 UTC (rev 2354)
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/xdm/genauth.c,v 1.1.4.5 2003/12/20 00:28:31 kaleb Exp
$ */
+/* $XdotOrg: app/xdm/genauth.c,v 1.2 2004/04/23 19:54:42 eich Exp $ */
/* $Xorg: genauth.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ */
/*
Modified: vendor/X11R7.1/app/xdm/greeter/Makefile.am
===================================================================
--- vendor/X11R7.1/app/xdm/greeter/Makefile.am 2006-06-25 23:34:46 UTC (rev
2353)
+++ vendor/X11R7.1/app/xdm/greeter/Makefile.am 2006-06-30 02:31:38 UTC (rev
2354)
@@ -1,4 +1,4 @@
-# $XdotOrg: app/xdm/greeter/Makefile.am,v $
+# $XdotOrg: app/xdm/greeter/Makefile.am,v 1.4 2005/11/14 04:25:43 alanc Exp $
if DYNAMIC_GREETER
xdmlibdir = $(XDMLIBDIR)
Modified: vendor/X11R7.1/app/xdm/greeter/Makefile.in
===================================================================
--- vendor/X11R7.1/app/xdm/greeter/Makefile.in 2006-06-25 23:34:46 UTC (rev
2353)
+++ vendor/X11R7.1/app/xdm/greeter/Makefile.in 2006-06-30 02:31:38 UTC (rev
2354)
@@ -14,7 +14,7 @@
@SET_MAKE@
-# $XdotOrg: app/xdm/greeter/Makefile.am,v $
+# $XdotOrg: app/xdm/greeter/Makefile.am,v 1.4 2005/11/14 04:25:43 alanc Exp $
SOURCES = $(libXdmGreet_la_SOURCES)
Modified: vendor/X11R7.1/app/xdm/greeter/greet.c
===================================================================
--- vendor/X11R7.1/app/xdm/greeter/greet.c 2006-06-25 23:34:46 UTC (rev
2353)
+++ vendor/X11R7.1/app/xdm/greeter/greet.c 2006-06-30 02:31:38 UTC (rev
2354)
@@ -1,5 +1,5 @@
/* $Xorg: greet.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */
-/* $XdotOrg: $ */
+/* $XdotOrg: app/xdm/greeter/greet.c,v 1.3 2005/08/19 04:26:04 alanc Exp $ */
/*
Copyright 1988, 1998 The Open Group
Modified: vendor/X11R7.1/app/xdm/resource.c
===================================================================
--- vendor/X11R7.1/app/xdm/resource.c 2006-06-25 23:34:46 UTC (rev 2353)
+++ vendor/X11R7.1/app/xdm/resource.c 2006-06-30 02:31:38 UTC (rev 2354)
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/xdm/resource.c,v 1.2 2004/04/23 19:54:42 eich Exp $ */
+/* $XdotOrg: app/xdm/resource.c,v 1.4 2005/11/08 06:33:31 jkj Exp $ */
/* $Xorg: resource.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */
/*
Modified: vendor/X11R7.1/app/xdm/session.c
===================================================================
--- vendor/X11R7.1/app/xdm/session.c 2006-06-25 23:34:46 UTC (rev 2353)
+++ vendor/X11R7.1/app/xdm/session.c 2006-06-30 02:31:38 UTC (rev 2354)
@@ -1,4 +1,4 @@
-/* $XdotOrg: app/xdm/session.c,v 1.6 2006/04/08 00:22:23 alanc Exp $ */
+/* $XdotOrg: app/xdm/session.c,v 1.6.2.1 2006/06/22 18:55:23 alanc Exp $ */
/* $Xorg: session.c,v 1.8 2001/02/09 02:05:40 xorgcvs Exp $ */
/*
@@ -490,8 +490,14 @@
else
ResetServer (d);
if (removeAuth) {
- setgid (verify.gid);
- setuid (verify.uid);
+ if (setgid (verify.gid) == -1) {
+ LogError( "SessionExit: setgid: %s\n", strerror(errno));
+ exit(status);
+ }
+ if (setuid (verify.uid) == -1) {
+ LogError( "SessionExit: setuid: %s\n", strerror(errno));
+ exit(status);
+ }
RemoveUserAuthorization (d, &verify);
#ifdef K5AUTH
/* do like "kdestroy" program */
Modified: vendor/X11R7.1/app/xdm/xdmcp.c
===================================================================
--- vendor/X11R7.1/app/xdm/xdmcp.c 2006-06-25 23:34:46 UTC (rev 2353)
+++ vendor/X11R7.1/app/xdm/xdmcp.c 2006-06-30 02:31:38 UTC (rev 2354)
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/xdm/xdmcp.c,v 1.4 2004/08/07 19:22:01 alanc Exp $ */
+/* $XdotOrg: app/xdm/xdmcp.c,v 1.5 2005/07/05 18:52:33 alanc Exp $ */
/* $Xorg: xdmcp.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */
/*
Modified: vendor/X11R7.1/app/xdm/xdmshell.c
===================================================================
--- vendor/X11R7.1/app/xdm/xdmshell.c 2006-06-25 23:34:46 UTC (rev 2353)
+++ vendor/X11R7.1/app/xdm/xdmshell.c 2006-06-30 02:31:38 UTC (rev 2354)
@@ -183,7 +183,11 @@
#endif
/* make xdm run in a non-setuid environment */
- setuid (geteuid());
+ if (setuid (geteuid()) == -1) {
+ fprintf(stderr, "%s: cannot setuid (error %d, %s)\r\n",
+ ProgramName, errno, strerror(errno));
+ exit(1);
+ }
/*
* exec /usr/bin/X11/xdm -nodaemon -udpPort 0
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
