- 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

diff --git a/ChangeLog b/ChangeLog
index cb47fa7640c054c4e8d79bd2db396d9907ee194d..1f09a2a415e0f93b939e03f25562a3368e6d5786 100644 (file)
--- 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 692a2961f9e7b10cfbfd26d44c78cd725eed950d..3332f4f83207da13488d6ae9fc09592f72a29fd8 100644 (file)
--- 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 = {