Attachment #1684 for bug #1638

View | Details | Raw Unified | Return to bug 1638
Collapse All | Expand All

Lines 244-250 do_authloop(Authctxt *authctxt) Link Here

(-)openssh-5.2p1/auth1.c.skip-initial (-1 / +1 lines)
244	authctxt->valid ? "" : "invalid user ", authctxt->user);	244	authctxt->valid ? "" : "invalid user ", authctxt->user);
245		245
246	/* If the user has no password, accept authentication immediately. */	246	/* If the user has no password, accept authentication immediately. */
247	if (options.password_authentication &&	247	if (options.permit_empty_passwd && options.password_authentication &&
248	#ifdef KRB5	248	#ifdef KRB5
249	(!options.kerberos_authentication \|\| options.kerberos_or_local_passwd) &&	249	(!options.kerberos_authentication \|\| options.kerberos_or_local_passwd) &&
250	#endif	250	#endif

Lines 65-71 userauth_none(Authctxt *authctxt) Link Here

(-)openssh-5.2p1/auth2-none.c.skip-initial (-1 / +1 lines)
65	if (check_nt_auth(1, authctxt->pw) == 0)	65	if (check_nt_auth(1, authctxt->pw) == 0)
66	return (0);	66	return (0);
67	#endif	67	#endif
68	if (options.password_authentication)	68	if (options.permit_empty_passwd && options.password_authentication)
69	return (PRIVSEP(auth_password(authctxt, "")));	69	return (PRIVSEP(auth_password(authctxt, "")));
70	return (0);	70	return (0);
71	}	71	}

Return to bug 1638