diff options
-rw-r--r-- | auth-pam.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/auth-pam.c b/auth-pam.c index 50d2073d7..00ba87775 100644 --- a/auth-pam.c +++ b/auth-pam.c | |||
@@ -287,18 +287,27 @@ sshpam_chauthtok_ruid(pam_handle_t *pamh, int flags) | |||
287 | void | 287 | void |
288 | sshpam_password_change_required(int reqd) | 288 | sshpam_password_change_required(int reqd) |
289 | { | 289 | { |
290 | extern struct sshauthopt *auth_opts; | ||
291 | static int saved_port, saved_agent, saved_x11; | ||
292 | |||
290 | debug3("%s %d", __func__, reqd); | 293 | debug3("%s %d", __func__, reqd); |
291 | if (sshpam_authctxt == NULL) | 294 | if (sshpam_authctxt == NULL) |
292 | fatal("%s: PAM authctxt not initialized", __func__); | 295 | fatal("%s: PAM authctxt not initialized", __func__); |
293 | sshpam_authctxt->force_pwchange = reqd; | 296 | sshpam_authctxt->force_pwchange = reqd; |
294 | if (reqd) { | 297 | if (reqd) { |
295 | no_port_forwarding_flag |= 2; | 298 | saved_port = auth_opts->permit_port_forwarding_flag; |
296 | no_agent_forwarding_flag |= 2; | 299 | saved_agent = auth_opts->permit_agent_forwarding_flag; |
297 | no_x11_forwarding_flag |= 2; | 300 | saved_x11 = auth_opts->permit_x11_forwarding_flag; |
301 | auth_opts->permit_port_forwarding_flag = 0; | ||
302 | auth_opts->permit_agent_forwarding_flag = 0; | ||
303 | auth_opts->permit_x11_forwarding_flag = 0; | ||
298 | } else { | 304 | } else { |
299 | no_port_forwarding_flag &= ~2; | 305 | if (saved_port) |
300 | no_agent_forwarding_flag &= ~2; | 306 | auth_opts->permit_port_forwarding_flag = saved_port; |
301 | no_x11_forwarding_flag &= ~2; | 307 | if (saved_agent) |
308 | auth_opts->permit_agent_forwarding_flag = saved_agent; | ||
309 | if (saved_x11) | ||
310 | auth_opts->permit_x11_forwarding_flag = saved_x11; | ||
302 | } | 311 | } |
303 | } | 312 | } |
304 | 313 | ||