From e74809e1c3d94ac5025e8cc90de336780aa69346 Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Mon, 2 Aug 2010 09:29:53 +0000
Subject: [PATCH] Fix use of logical and where binary and was intended. Spotted
 by Mike Belopuhov, ok yasuoka@

---
 usr.sbin/npppd/npppd/eap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr.sbin/npppd/npppd/eap.c b/usr.sbin/npppd/npppd/eap.c
index fd932f162d6..fbafddca7a5 100644
--- a/usr.sbin/npppd/npppd/eap.c
+++ b/usr.sbin/npppd/npppd/eap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eap.c,v 1.3 2010/07/02 21:20:57 yasuoka Exp $ */
+/* $OpenBSD: eap.c,v 1.4 2010/08/02 09:29:53 jsg Exp $ */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -34,7 +34,7 @@
  *	    RADIUS (Remote Authentication Dial In User Service) Support For
  *	    Extensible Authentication Protocol (EAP). B. Aboba, P. Calhoun.
  */
-/* $Id: eap.c,v 1.3 2010/07/02 21:20:57 yasuoka Exp $ */
+/* $Id: eap.c,v 1.4 2010/08/02 09:29:53 jsg Exp $ */
 
 /* FIXME: This must be rewritten. */
 
@@ -590,8 +590,8 @@ eap_recv_from_radius(void *context, RADIUS_PACKET *pkt, int flags)
 		goto auth_failed;
         }
 
-        if(!(flags && RADIUS_REQUST_CHECK_AUTHENTICTOR_NO_CHECK) &&
-            !(flags && RADIUS_REQUST_CHECK_AUTHENTICTOR_OK)){
+        if(!(flags & RADIUS_REQUST_CHECK_AUTHENTICTOR_NO_CHECK) &&
+            !(flags & RADIUS_REQUST_CHECK_AUTHENTICTOR_OK)){
                 /* discard */
                 eap_log(_this, LOG_WARNING, "Header has invalid authticator");
 		notify_reason = "bad authenticator";
-- 
2.20.1