Module Name: src
Committed By: rin
Date: Fri Jul 7 07:04:18 UTC 2023
Modified Files:
src/crypto/external/bsd/openssh/dist: auth-passwd.c
Log Message:
Remove extra whitespace inserted during merge. No binary changes.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssh/dist/auth-passwd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/auth-passwd.c
diff -u src/crypto/external/bsd/openssh/dist/auth-passwd.c:1.12 src/crypto/external/bsd/openssh/dist/auth-passwd.c:1.13
--- src/crypto/external/bsd/openssh/dist/auth-passwd.c:1.12 Fri Mar 5 17:47:15 2021
+++ src/crypto/external/bsd/openssh/dist/auth-passwd.c Fri Jul 7 07:04:17 2023
@@ -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 cha
#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
