diff options
| author | rin <rin@NetBSD.org> | 2023-07-07 07:04:17 +0000 |
|---|---|---|
| committer | rin <rin@NetBSD.org> | 2023-07-07 07:04:17 +0000 |
| commit | dee5f377e3c043c2998ef5524d65090b8a5327a9 (patch) | |
| tree | c3237e297d9e0b26667c9d33e68dcaf673e0abb2 | |
| parent | 26e1948b2227a9bbe2ef5e1cd1ab0476de718d1e (diff) | |
Remove extra whitespace inserted during merge. No binary changes.
| -rw-r--r-- | crypto/external/bsd/openssh/dist/auth-passwd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/external/bsd/openssh/dist/auth-passwd.c b/crypto/external/bsd/openssh/dist/auth-passwd.c index c9a7a485493..5b3b4d4682d 100644 --- a/crypto/external/bsd/openssh/dist/auth-passwd.c +++ b/crypto/external/bsd/openssh/dist/auth-passwd.c @@ -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 $ */ /* @@ -39,7 +39,7 @@ */ #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 <login_cap.h> @@ -94,9 +94,9 @@ auth_password(struct ssh *ssh, const char *password) #ifdef KRB5 if (options.kerberos_authentication == 1) { int ret = auth_krb5_password(authctxt, password); - if (ret == 1 || ret == 0) - return ret && ok; - /* Fall back to ordinary passwd authentication. */ + if (ret == 1 || ret == 0) + return ret && ok; + /* Fall back to ordinary passwd authentication. */ } #endif |
