diff options
author | Darren Tucker <dtucker@zip.com.au> | 2016-03-15 09:24:43 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2016-03-15 09:24:43 +1100 |
commit | 8c4739338f5e379d05b19d6e544540114965f07e (patch) | |
tree | e4c29cf0627f30e3ff0487b7eef3142ddd7ee7f0 /platform.c | |
parent | cff26f373c58457a32cb263e212cfff53fca987b (diff) | |
download | openssh-git-8c4739338f5e379d05b19d6e544540114965f07e.tar.gz |
Don't call Solaris setproject() with UsePAM=yes.
When Solaris Projects are enabled along with PAM setting the project
is PAM's responsiblity. bz#2425, based on patch from
brent.paulson at gmail.com.
Diffstat (limited to 'platform.c')
-rw-r--r-- | platform.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -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 |