From 0f57e1e6acc1c218de5c1a496f7b0b759637bcdc Mon Sep 17 00:00:00 2001
From: dtucker <dtucker>
Date: Sat, 2 Aug 2003 14:05:01 +0000
Subject: [PATCH]    - markus@cvs.openbsd.org 2003/07/31 09:21:02     
 [auth2-none.c]      check whether passwd auth is allowd, similar to proto 1;
 rob@pitman.co.za      ok henning

---
 ChangeLog    | 4 ++++
 auth2-none.c | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cb47fa76..1f09a2a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,10 @@
    - markus@cvs.openbsd.org 2003/07/30 07:53:27
      [progressmeter.c]
      whitespace (included with previous import)
+   - markus@cvs.openbsd.org 2003/07/31 09:21:02
+     [auth2-none.c]
+     check whether passwd auth is allowd, similar to proto 1; rob@pitman.co.za
+     ok henning
 
  - (dtucker) [openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
    Add a tcgetpgrp function.
diff --git a/auth2-none.c b/auth2-none.c
index 692a2961..3332f4f8 100644
--- a/auth2-none.c
+++ b/auth2-none.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2-none.c,v 1.4 2002/06/27 10:35:47 deraadt Exp $");
+RCSID("$OpenBSD: auth2-none.c,v 1.5 2003/07/31 09:21:02 markus Exp $");
 
 #include "auth.h"
 #include "xmalloc.h"
@@ -100,7 +100,9 @@ userauth_none(Authctxt *authctxt)
 	if (check_nt_auth(1, authctxt->pw) == 0)
 		return(0);
 #endif
-	return PRIVSEP(auth_password(authctxt, "")) && authctxt->valid;
+	if (options.password_authentication && authctxt->valid)
+		return (PRIVSEP(auth_password(authctxt, "")));
+	return (0);
 }
 
 Authmethod method_none = {
-- 
2.45.1