New upstream release (7.3p1).

1 files changed, 6 insertions, 4 deletions

diff --git a/platform.c b/platform.c
index 9a23e6e3e..2ce4dbf81 100644
--- a/platform.c
+++ b/platform.c
@@ -18,8 +18,6 @@
 
 #include "includes.h"
 
-#include <sys/types.h>
-
 #include <stdarg.h>
 #include <unistd.h>
 
@@ -107,8 +105,12 @@ platform_setusercontext(struct passwd *pw)
 #endif
 
 #ifdef USE_SOLARIS_PROJECTS
-        /* if solaris projects were detected, set the default now */
-        if (getuid() == 0 || geteuid() == 0)
+        /*
+         * If solaris projects were detected, set the default now, unless
+         * we are using PAM in which case it is the responsibility of the
+         * PAM stack.
+         */
+        if (!options.use_pam && (getuid() == 0 || geteuid() == 0))
                 solaris_set_default_project(pw);
 #endif