summaryrefslogtreecommitdiff
path: root/auth-pam.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-03-03 03:15:51 +0000
committerDamien Miller <djm@mindrot.org>2018-03-03 14:37:16 +1100
commit7c856857607112a3dfe6414696bf4c7ab7fb0cb3 (patch)
tree48c837fc9c9e11d64862d4f54c1a886b54d8721c /auth-pam.c
parent90c4bec8b5f9ec4c003ae4abdf13fc7766f00c8b (diff)
upstream: switch over to the new authorized_keys options API and
remove the legacy one. Includes a fairly big refactor of auth2-pubkey.c to retain less state between key file lines. feedback and ok markus@ OpenBSD-Commit-ID: dece6cae0f47751b9892080eb13d6625599573df
Diffstat (limited to 'auth-pam.c')
-rw-r--r--auth-pam.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/auth-pam.c b/auth-pam.c
index de29c04c9..50d2073d7 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -1077,7 +1077,7 @@ do_pam_chauthtok(void)
1077} 1077}
1078 1078
1079void 1079void
1080do_pam_session(void) 1080do_pam_session(struct ssh *ssh)
1081{ 1081{
1082 debug3("PAM: opening session"); 1082 debug3("PAM: opening session");
1083 1083
@@ -1093,7 +1093,7 @@ do_pam_session(void)
1093 sshpam_session_open = 1; 1093 sshpam_session_open = 1;
1094 else { 1094 else {
1095 sshpam_session_open = 0; 1095 sshpam_session_open = 0;
1096 disable_forwarding(); 1096 auth_restrict_session(ssh);
1097 error("PAM: pam_open_session(): %s", 1097 error("PAM: pam_open_session(): %s",
1098 pam_strerror(sshpam_handle, sshpam_err)); 1098 pam_strerror(sshpam_handle, sshpam_err));
1099 } 1099 }