8fed35dbe8
Resolves: #1023620
28 lines
917 B
Diff
28 lines
917 B
Diff
From fcb95abad72ac043f2e5f5ddcffc42b0783a3c2d Mon Sep 17 00:00:00 2001
|
|
From: Michal Sekletar <msekleta@redhat.com>
|
|
Date: Wed, 10 Dec 2014 12:21:31 +0100
|
|
Subject: [PATCH] Fix logical expression in eap_client_active macro
|
|
|
|
---
|
|
pppd/eap.h | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/pppd/eap.h b/pppd/eap.h
|
|
index 3fa5391..087baad 100644
|
|
--- a/pppd/eap.h
|
|
+++ b/pppd/eap.h
|
|
@@ -110,8 +110,8 @@ enum eap_state_code {
|
|
"SRP1", "SRP2", "SRP3", "MD5Chall", "Open", "SRP4", "BadAuth"
|
|
|
|
#ifdef USE_EAPTLS
|
|
-#define eap_client_active(esp) ((esp)->es_client.ea_state != eapInitial ||\
|
|
- (esp)->es_client.ea_state != eapPending ||\
|
|
+#define eap_client_active(esp) ((esp)->es_client.ea_state != eapInitial &&\
|
|
+ (esp)->es_client.ea_state != eapPending &&\
|
|
(esp)->es_client.ea_state != eapClosed)
|
|
#else
|
|
#define eap_client_active(esp) ((esp)->es_client.ea_state == eapListen)
|
|
--
|
|
1.8.3.1
|
|
|