--- trunk/magellan-initscripts/etc/rc.d/init.d/network	2005/09/22 22:15:38	245
+++ trunk/magellan-initscripts/etc/rc.d/init.d/network	2005/10/09 21:39:59	264
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/etc/rc.d/init.d/network,v 1.6 2005-09-22 22:15:38 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/etc/rc.d/init.d/network,v 1.7 2005-10-09 21:39:59 niro Exp $
 
 #%rlevels: 0:k 1:k 2:k 3:s 4:s 5:s 6:k
 #%start: 20
@@ -194,7 +194,15 @@
 			[[ -n ${WIRELESS_FREQUENCY} ]] && iwconfig "${iface}" freq "${WIRELESS_FREQUENCY}"
 			[[ -n ${WIRELESS_MODE} ]] && iwconfig "${iface}" mode "${WIRELESS_MODE}"
 			[[ -n ${WIRELESS_NICK} ]] && iwconfig "${iface}" nick "${WIRELESS_NICK}"
-			[[ -n ${WIRELESS_AUTH_MODE} ]] && iwconfig "${iface}" enc "${WIRELESS_AUTH_MODE}"
+			if [[ -n ${WIRELESS_AUTH_MODE} ]]
+			then
+				case ${WIRELESS_AUTH_MODE} in
+					wpa)	echo "Using wpa";;
+					wep,on) iwconfig "${iface}" enc on ;;
+					off)	iwconfig "${iface}" enc off ;;
+					*)	echo "Unkown Wireless_Auth_Mode '${WIRELESS_AUTH_MODE}'." ;;
+				esac
+			fi
 			[[ -n ${WIRELESS_KEY_LENGTH} ]] && iwconfig "${iface}" enc "${WIRELESS_KEY_LENGTH}"
 			[[ -n ${WIRELESS_KEY} ]] && iwconfig "${iface}" key "${WIRELESS_KEY}"
 			[[ -n ${WIRELESS_KEY_ASCII} ]] && iwconfig "${iface}" key s:"${WIRELESS_KEY_ASCII}"