From b3babfdc25935ff860d96d8e495017df27491c14 Mon Sep 17 00:00:00 2001
From: Sam Leffler <sam@FreeBSD.org>
Date: Tue, 14 Feb 2006 23:51:21 +0000
Subject: [PATCH] Change default build of wpa_supplicant to include EAPOL
 support; ENABLE_WPA_SUPPLICANT_EAPOL is no more, now use
 NO_WPA_SUPPLICANT_EAPOL to build with only WPA-PSK support.

Reviewed by:	ru, bsdimp (basic approach)
MFC after:	1 week
---
 share/examples/etc/make.conf                      |  7 ++-----
 share/man/man5/make.conf.5                        | 11 +++--------
 usr.sbin/wpa/wpa_supplicant/Makefile              |  2 +-
 usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 |  8 ++++----
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 6e89efb9ea8..997eaaf8d44 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -331,9 +331,6 @@
 #
 # wpa_supplicant
 #
-# Enable this to include 802.1X and EAP support in wpa_supplicant.
-# 802.1X with EAP requires openssl but it can be used without to
-# do things like dynamic WEP keying.  The default is to build
-# wpa_supplicant only with WPA-PSK support.
+# Set this to disable building 802.1X and EAP support in wpa_supplicant.
 #
-#ENABLE_WPA_SUPPLICANT_EAPOL=true
+#NO_WPA_SUPPLICANT_EAPOL=true
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index e422684e127..12f1b800cb5 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 22, 2005
+.Dd February 14, 2006
 .Dt MAKE.CONF 5
 .Os
 .Sh NAME
@@ -435,18 +435,13 @@ will not be able to change users' groups.
 Set this to install
 .Xr ssh 1
 with the set-user-ID bit turned on.
-.It Va ENABLE_WPA_SUPPLICANT_EAPOL
+.It Va NO_WPA_SUPPLICANT_EAPOL
 .Pq Vt str
 Build
 .Xr wpa_supplicant 8
-with support for the IEEE 802.1X protocol and with
+without support for the IEEE 802.1X protocol and without
 support for EAP-PEAP, EAP-TLS, EAP-LEAP, and EAP-TTLS
 protocols (usable only via 802.1X).
-This option is ignored if
-.Va NO_CRYPT
-or
-.Va NO_OPENSSL
-are set.
 .It Va MAKE_IDEA
 .Pq Vt bool
 Set to build the IDEA encryption code.
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile
index 19e0b24667d..3c138fcde49 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile
@@ -19,7 +19,7 @@ CFLAGS+= -g
 DPADD+=	${LIBPCAP}
 LDADD+=	-lpcap
 
-.if defined(ENABLE_WPA_SUPPLICANT_EAPOL)
+.if !defined(NO_WPA_SUPPLICANT_EAPOL)
 SRCS+=	eapol_sm.c eap.c
 CFLAGS+= -DIEEE8021X_EAPOL
 
diff --git a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
index 64f6a02af77..e1fb040ec85 100644
--- a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
+++ b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 16, 2005
+.Dd February 14, 2006
 .Dt WPA_SUPPLICANT.CONF 5
 .Os
 .Sh NAME
@@ -248,11 +248,11 @@ If not set this defaults to all available methods compiled in to
 .Xr wpa_supplicant 8 .
 Note that by default
 .Xr wpa_supplicant 8
-is not compiled with EAP support; see
+is compiled with EAP support; see
 .Xr make.conf 5
 for the
-.Va ENABLE_WPA_SUPPLICANT_EAPOL
-configuration variable.
+.Va NO_WPA_SUPPLICANT_EAPOL
+configuration variable that can be used to disable EAP support.
 .It Va identity
 Identity string for EAP.
 .It Va anonymous_identity