Remove extra whitespace inserted during merge. No binary changes.
This commit is contained in:
parent
1267710ee7
commit
b2eb12c7ba
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: auth-passwd.c,v 1.12 2021/03/05 17:47:15 christos Exp $ */
|
/* $NetBSD: auth-passwd.c,v 1.13 2023/07/07 07:04:17 rin Exp $ */
|
||||||
/* $OpenBSD: auth-passwd.c,v 1.48 2020/10/18 11:32:01 djm Exp $ */
|
/* $OpenBSD: auth-passwd.c,v 1.48 2020/10/18 11:32:01 djm Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -39,7 +39,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
__RCSID("$NetBSD: auth-passwd.c,v 1.12 2021/03/05 17:47:15 christos Exp $");
|
__RCSID("$NetBSD: auth-passwd.c,v 1.13 2023/07/07 07:04:17 rin Exp $");
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
#include <login_cap.h>
|
#include <login_cap.h>
|
||||||
|
@ -94,9 +94,9 @@ auth_password(struct ssh *ssh, const char *password)
|
||||||
#ifdef KRB5
|
#ifdef KRB5
|
||||||
if (options.kerberos_authentication == 1) {
|
if (options.kerberos_authentication == 1) {
|
||||||
int ret = auth_krb5_password(authctxt, password);
|
int ret = auth_krb5_password(authctxt, password);
|
||||||
if (ret == 1 || ret == 0)
|
if (ret == 1 || ret == 0)
|
||||||
return ret && ok;
|
return ret && ok;
|
||||||
/* Fall back to ordinary passwd authentication. */
|
/* Fall back to ordinary passwd authentication. */
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue