1 files changed, 6 insertions, 2 deletions

diff --git a/platform.c b/platform.c
index ee313da55..1f68df3a6 100644
--- a/platform.c
+++ b/platform.c
@@ -107,8 +107,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