ports/x11/xdm/files/patch-session.c
Florent Thoumie 451bceb7cc - Fix configuration file location.
- Respect user context.
2007-10-09 19:26:51 +00:00

27 lines
793 B
C

--- session.c.orig Sun Jun 3 22:49:51 2007
+++ session.c Sun Jun 3 22:56:06 2007
@@ -543,6 +543,7 @@
pid_t pid;
#ifdef HAS_SETUSERCONTEXT
struct passwd* pwd;
+ extern char **environ;
#endif
#ifdef USE_PAM
pam_handle_t *pamh = thepamh ();
@@ -657,6 +660,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) {
if (setusercontext(NULL, pwd, pwd->pw_uid, LOGIN_SETALL) < 0) {
@@ -664,6 +669,7 @@
errno);
return (0);
}
+ verify->userEnviron = environ;
endpwent();
} else {
LogError ("getpwnam for \"%s\" failed, errno=%d\n", name, errno);