diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-24 21:39:36 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-24 21:39:36 +0000 |
commit | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (patch) | |
tree | d12ff16d94cffc5d84dba0193eaaa616967c9c2c /auth1.c | |
parent | cadac134eda6ed97478afdc528a68dd33f31dbc5 (diff) | |
parent | 1e4cfeee6c17b02af09418c5afe4a4d71aaaf0c8 (diff) |
import openssh-5.3p1-gsskex-all-20100124.patch
Diffstat (limited to 'auth1.c')
-rw-r--r-- | auth1.c | 10 |
1 files changed, 1 insertions, 9 deletions
@@ -318,15 +318,7 @@ do_authloop(Authctxt *authctxt) | |||
318 | } | 318 | } |
319 | #endif /* _UNICOS */ | 319 | #endif /* _UNICOS */ |
320 | 320 | ||
321 | #ifdef HAVE_CYGWIN | 321 | #ifndef HAVE_CYGWIN |
322 | if (authenticated && | ||
323 | !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD, | ||
324 | authctxt->pw)) { | ||
325 | packet_disconnect("Authentication rejected for uid %d.", | ||
326 | authctxt->pw == NULL ? -1 : authctxt->pw->pw_uid); | ||
327 | authenticated = 0; | ||
328 | } | ||
329 | #else | ||
330 | /* Special handling for root */ | 322 | /* Special handling for root */ |
331 | if (authenticated && authctxt->pw->pw_uid == 0 && | 323 | if (authenticated && authctxt->pw->pw_uid == 0 && |
332 | !auth_root_allowed(meth->name)) { | 324 | !auth_root_allowed(meth->name)) { |