| 1 |
diff -up openssh-5.3p1/auth1.c.skip-initial openssh-5.3p1/auth1.c
|
| 2 |
--- openssh-5.3p1/auth1.c.skip-initial 2009-03-08 01:40:28.000000000 +0100
|
| 3 |
+++ openssh-5.3p1/auth1.c 2009-10-02 13:55:00.000000000 +0200
|
| 4 |
@@ -244,7 +244,7 @@ do_authloop(Authctxt *authctxt)
|
| 5 |
authctxt->valid ? "" : "invalid user ", authctxt->user);
|
| 6 |
|
| 7 |
/* If the user has no password, accept authentication immediately. */
|
| 8 |
- if (options.password_authentication &&
|
| 9 |
+ if (options.permit_empty_passwd && options.password_authentication &&
|
| 10 |
#ifdef KRB5
|
| 11 |
(!options.kerberos_authentication || options.kerberos_or_local_passwd) &&
|
| 12 |
#endif
|
| 13 |
diff -up openssh-5.3p1/auth2-none.c.skip-initial openssh-5.3p1/auth2-none.c
|
| 14 |
--- openssh-5.3p1/auth2-none.c.skip-initial 2009-03-08 01:40:28.000000000 +0100
|
| 15 |
+++ openssh-5.3p1/auth2-none.c 2009-10-02 13:56:21.000000000 +0200
|
| 16 |
@@ -61,7 +61,7 @@ userauth_none(Authctxt *authctxt)
|
| 17 |
{
|
| 18 |
none_enabled = 0;
|
| 19 |
packet_check_eom();
|
| 20 |
- if (options.password_authentication)
|
| 21 |
+ if (options.permit_empty_passwd && options.password_authentication)
|
| 22 |
return (PRIVSEP(auth_password(authctxt, "")));
|
| 23 |
return (0);
|
| 24 |
}
|