--- setvars	2004-05-16 17:40:30.000000000 +0200
+++ setvars.fix	2004-05-16 18:31:17.000000000 +0200
@@ -136,16 +136,16 @@
 FAI_PWD=""
 if [ ! -z "$FAI_LOGIN" ] ; then
 	if [ -e $PPP_DIR/chap-secrets ] ; then
-		FAI_PWD=`grep $FAI_LOGIN $PPP_DIR/chap-secrets | sed "s/ /_/g" | sed "s/\t/_/g" | sed -r "s/_+/_/g" | cut -d "_" -f3`
+		FAI_PWD=`grep "$FAI_LOGIN" $PPP_DIR/chap-secrets | sed "s/ /_/g" | sed "s/\t/_/g" | sed -r "s/_+/_/g" | cut -d "_" -f3`
 	fi
 	if [ -z "$FAI_PWD" ] && [ -e $PPP_DIR/pap-secrets ] ; then
-		FAI_PWD=`grep $FAI_LOGIN $PPP_DIR/pap-secrets | sed "s/ /_/g" | sed "s/\t/_/g" | sed -r "s/_+/_/g" | cut -d "_" -f3`
+		FAI_PWD=`grep "$FAI_LOGIN" $PPP_DIR/pap-secrets | sed "s/ /_/g" | sed "s/\t/_/g" | sed -r "s/_+/_/g" | cut -d "_" -f3`
 	fi
 fi
 
 # Password encryption (CHAP)
 PWD_ENCRYPT=0
-if [ -e $PPP_DIR/chap-secrets ] && [ ! -z $FAI_LOGIN ] ; then
+if [ -e $PPP_DIR/chap-secrets ] && [ ! -z "$FAI_LOGIN" ] ; then
 	if grep -q "$FAI_LOGIN" $PPP_DIR/chap-secrets ; then
 		PWD_ENCRYPT=1
 	fi