aboutsummaryrefslogtreecommitdiff
path: root/x11/xdm/files/patch-xdm_session.c
diff options
context:
space:
mode:
Diffstat (limited to 'x11/xdm/files/patch-xdm_session.c')
-rw-r--r--x11/xdm/files/patch-xdm_session.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/x11/xdm/files/patch-xdm_session.c b/x11/xdm/files/patch-xdm_session.c
index de1c579b4f8b..9ac29aa7c1e3 100644
--- a/x11/xdm/files/patch-xdm_session.c
+++ b/x11/xdm/files/patch-xdm_session.c
@@ -1,14 +1,14 @@
---- xdm/session.c.orig Sun Jun 3 22:49:51 2007
-+++ xdm/session.c Sun Jun 3 22:56:06 2007
-@@ -543,6 +543,7 @@
+--- xdm/session.c.orig 2011-09-25 07:35:47 UTC
++++ xdm/session.c
+@@ -575,6 +575,7 @@ StartClient (
pid_t pid;
- #ifdef HAS_SETUSERCONTEXT
+ #ifdef HAVE_SETUSERCONTEXT
struct passwd* pwd;
+ extern char **environ;
#endif
#ifdef USE_PAM
pam_handle_t *pamh = thepamh ();
-@@ -657,6 +660,8 @@
+@@ -695,6 +696,8 @@ StartClient (
* Set the user's credentials: uid, gid, groups,
* environment variables, resource limits, and umask.
*/
@@ -17,11 +17,11 @@
pwd = getpwnam(name);
if (pwd) {
if (setusercontext(NULL, pwd, pwd->pw_uid, LOGIN_SETALL) < 0) {
-@@ -664,6 +669,7 @@
- errno);
+@@ -702,6 +705,7 @@ StartClient (
+ name, _SysErrorMsg (errno));
return (0);
}
+ verify->userEnviron = environ;
endpwent();
} else {
- LogError ("getpwnam for \"%s\" failed, errno=%d\n", name, errno);
+ LogError ("getpwnam for \"%s\" failed: %s\n",