From ff95a0e1eb05081ec2daf1fbb9b0f6d1012c1763 Mon Sep 17 00:00:00 2001
From: sam <sam@FreeBSD.org>
Date: Tue, 14 Feb 2006 23:51:21 +0000
Subject: 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 +++--------
 2 files changed, 5 insertions(+), 13 deletions(-)

(limited to 'share')

diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 6e89efb..997eaaf 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 e422684..12f1b80 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.
-- 
cgit v1.1