Attachment 94699 Details for Bug 101157 – Updated openssh-3.5p1-skip-initial.patch file

[patch] Updated openssh-3.5p1-skip-initial.patch file

openssh-3.5p1-skip-initial.patch (text/plain), 1.20 KB, created by John Caruso on 2003-09-24 20:49:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Caruso

Created: 2003-09-24 20:49:20 UTC

Size: 1.20 KB

patch

obsolete

>Skip the initial empty-password check if permit_empty_passwd is disabled.  This
>doesn't change the timing profiles of the host because the additional condition
>check which can short-circuit the call to pam_authenticate() has no dependency
>on the identity of the user who is being authenticated.
>--- openssh-3.5p1/auth2-none.c	2003-09-16 08:22:37.000000000 -0400
>+++ openssh-3.5p1/auth2-none.c	2003-09-16 08:22:42.000000000 -0400
>@@ -100,7 +100,7 @@
> 	if (check_nt_auth(1, authctxt->pw) == 0)
> 		return(0);
> #endif
>-	return PRIVSEP(auth_password(authctxt, "")) && authctxt->valid;
>+	return options.permit_empty_passwd && PRIVSEP(auth_password(authctxt, "")) && authctxt->valid;
> }
> 
> Authmethod method_none = {
>--- openssh-3.5p1/auth1.c	2003-09-19 10:19:45.000000000 -0400
>+++ openssh-3.5p1/auth1.c	2003-09-19 10:20:16.000000000 -0400
>@@ -80,7 +80,7 @@
> 	    authctxt->valid ? "" : "illegal user ", authctxt->user);
> 
> 	/* If the user has no password, accept authentication immediately. */
>-	if (options.password_authentication &&
>+	if (options.permit_empty_passwd && options.password_authentication &&
> #if defined(KRB4) || defined(KRB5)
> 	    (!options.kerberos_authentication || options.kerberos_or_local_passwd) &&
> #endif

Actions: View | Diff

Attachments on bug 101157: 94698 | 94699