diff options
| author | FUJISHIMA Satsuki <sf@FreeBSD.org> | 2001-10-28 02:41:04 +0000 |
|---|---|---|
| committer | FUJISHIMA Satsuki <sf@FreeBSD.org> | 2001-10-28 02:41:04 +0000 |
| commit | cbda03d0ac8ed1df6d42810e8738199b6917b2be (patch) | |
| tree | c818b4449b96f9b925af0e3de322df185379e81a | |
| parent | Upgrade to 7.5.4. (diff) | |
o sync with x11/XFree86-4
- startx -nolisten tcp by default.
- set login.conf environment for xdm.
Notes
Notes:
svn path=/head/; revision=49276
| -rw-r--r-- | x11/XFree86-4-clients/Makefile | 1 | ||||
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-xdm_session.c | 27 |
2 files changed, 28 insertions, 0 deletions
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile index 1d639e89f53c..2a806513cf5d 100644 --- a/x11/XFree86-4-clients/Makefile +++ b/x11/XFree86-4-clients/Makefile @@ -7,6 +7,7 @@ PORTNAME= clients PORTVERSION= 4.1.0 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= 4.1.0 diff --git a/x11/XFree86-4-libraries/files/patch-xdm_session.c b/x11/XFree86-4-libraries/files/patch-xdm_session.c new file mode 100644 index 000000000000..c7c2d43dce28 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-xdm_session.c @@ -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 |