diff options
Diffstat (limited to 'session.c')
-rw-r--r-- | session.c | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -487,7 +487,8 @@ do_exec_no_pty(Session *s, const char *command, struct passwd * pw) | |||
487 | 487 | ||
488 | session_proctitle(s); | 488 | session_proctitle(s); |
489 | 489 | ||
490 | #ifdef USE_PAM | 490 | #if defined(USE_PAM) && defined(PAM_SUN_CODEBASE) |
491 | /* Solaris-derived PAMs don't like doing this after the fork() */ | ||
491 | do_pam_setcred(); | 492 | do_pam_setcred(); |
492 | #endif /* USE_PAM */ | 493 | #endif /* USE_PAM */ |
493 | 494 | ||
@@ -603,10 +604,11 @@ do_exec_pty(Session *s, const char *command, struct passwd * pw) | |||
603 | ptyfd = s->ptyfd; | 604 | ptyfd = s->ptyfd; |
604 | ttyfd = s->ttyfd; | 605 | ttyfd = s->ttyfd; |
605 | 606 | ||
606 | #ifdef USE_PAM | 607 | #if defined(USE_PAM) && defined(PAM_SUN_CODEBASE) |
608 | /* Solaris-derived PAMs don't like doing this after the fork() */ | ||
607 | do_pam_session(pw->pw_name, s->tty); | 609 | do_pam_session(pw->pw_name, s->tty); |
608 | do_pam_setcred(); | 610 | do_pam_setcred(); |
609 | #endif /* USE_PAM */ | 611 | #endif |
610 | 612 | ||
611 | /* Fork the child. */ | 613 | /* Fork the child. */ |
612 | if ((pid = fork()) == 0) { | 614 | if ((pid = fork()) == 0) { |
@@ -1032,6 +1034,11 @@ do_child(const char *command, struct passwd * pw, const char *term, | |||
1032 | #endif /* WITH_IRIX_ARRAY */ | 1034 | #endif /* WITH_IRIX_ARRAY */ |
1033 | #endif /* WITH_IRIX_JOBS */ | 1035 | #endif /* WITH_IRIX_JOBS */ |
1034 | 1036 | ||
1037 | #if defined(USE_PAM) && !defined(PAM_SUN_CODEBASE) | ||
1038 | /* Solaris-derived PAMs don't like doing this after the fork() */ | ||
1039 | do_pam_session(pw->pw_name, s->tty); | ||
1040 | do_pam_setcred(); | ||
1041 | #endif | ||
1035 | 1042 | ||
1036 | /* login(1) is only called if we execute the login shell */ | 1043 | /* login(1) is only called if we execute the login shell */ |
1037 | if (options.use_login && command != NULL) | 1044 | if (options.use_login && command != NULL) |