From 249558a24db1ac9b180a5be572cf6cc2cbebdee4 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Fri, 2 Sep 2005 01:13:13 +0000
Subject: Do not setup supplicant if running hostap

---
 etc/inc/interfaces.inc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'etc')

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index bcbed62..0d57780 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -394,8 +394,9 @@ function interfaces_wireless_configure($if, $wlcfg) {
 
         if ($wlcfg['stationname'])
                 $ifcargs .= "stationname " . escapeshellarg($wlcfg['stationname']) . " ";
-		
-	if (isset($wlcfg['wpa']['enable'])) {
+	
+	if(!$wlcfg['mode']) {
+		if (isset($wlcfg['wpa']['enable'])) {
 		
 	$wpa .= <<<EOD
 	
@@ -404,10 +405,11 @@ eapol_version=1
 ap_scan=1
 fast_reauth=1
 
-network=\{
+network={
 	ssid="{$wlcfg['ssid']}"
 	key_mgmt="{$wlcfg['wpapsk']}"
 	psk="{$wlcfg['passphrase']}"
+	
 }
 
 EOD;
@@ -417,6 +419,7 @@ EOD;
 		fclose($fd);
 		mwexec_bg("wpa_supplicant -i {$if} -c /etc/wpa_supplicant.conf");
 
+		}
 	}
 
         if (isset($wlcfg['wep']['enable']) && is_array($wlcfg['wep']['key'])) {
-- 
cgit v1.1