diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2016-03-14 23:24:43 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2016-03-14 23:24:43 +0100 |
| commit | 8c4739338f5e379d05b19d6e544540114965f07e (patch) | |
| tree | e4c29cf0627f30e3ff0487b7eef3142ddd7ee7f0 /platform.c | |
| parent | remove slogin from *.spec (diff) | |
| download | openssh-8c4739338f5e379d05b19d6e544540114965f07e.tar.xz openssh-8c4739338f5e379d05b19d6e544540114965f07e.zip | |
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 '')
| -rw-r--r-- | platform.c | 8 |
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 |