diff options
| author | jmz <jmz@FreeBSD.org> | 2001-10-25 04:05:14 +0800 |
|---|---|---|
| committer | jmz <jmz@FreeBSD.org> | 2001-10-25 04:05:14 +0800 |
| commit | b25c4f400c404421ede5c4c56b1b8548bd90bce9 (patch) | |
| tree | 0d2a640534aca22c33c6d239790e05b923ba250d | |
| parent | 079614bfb52ab192192f3b6e10e7552179b35797 (diff) | |
| download | freebsd-ports-gnome-b25c4f400c404421ede5c4c56b1b8548bd90bce9.tar.gz freebsd-ports-gnome-b25c4f400c404421ede5c4c56b1b8548bd90bce9.tar.zst freebsd-ports-gnome-b25c4f400c404421ede5c4c56b1b8548bd90bce9.zip | |
Patcch to xdm to set environment from login.conf
PR: ports/13614
Submitted by: Max Khon <fjoe@iclub.nsu.ru>
Obtained from: wdm distribution
| -rw-r--r-- | x11/XFree86-4/Makefile | 2 | ||||
| -rw-r--r-- | x11/XFree86-4/files/patch-xdm | 27 |
2 files changed, 28 insertions, 1 deletions
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile index 9641495a9b03..d84dd4bfd376 100644 --- a/x11/XFree86-4/Makefile +++ b/x11/XFree86-4/Makefile @@ -7,7 +7,7 @@ PORTNAME= XFree86 PORTVERSION= 4.1.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= 4.1.0 diff --git a/x11/XFree86-4/files/patch-xdm b/x11/XFree86-4/files/patch-xdm new file mode 100644 index 000000000000..c7c2d43dce28 --- /dev/null +++ b/x11/XFree86-4/files/patch-xdm @@ -0,0 +1,27 @@ +--- programs/xdm/session.c.orig Wed May 30 00:56:22 2001 ++++ programs/xdm/session.c Fri Sep 28 23:25:16 2001 +@@ -541,6 +541,7 @@ + int pid; + #ifdef HAS_SETUSERCONTEXT + struct passwd* pwd; ++ extern char **environ; + #endif + #ifdef USE_PAM + pam_handle_t *pamh = thepamh(); +@@ -623,6 +624,8 @@ + * Set the user's credentials: uid, gid, groups, + * environment variables, resource limits, and umask. + */ ++ /* destroy user environment before calling setusercontext */ ++ environ = verify->userEnviron; + pwd = getpwnam(name); + if (pwd) + { +@@ -632,6 +635,7 @@ + errno); + return (0); + } ++ verify->userEnviron = environ; + endpwent(); + } + else |