Do not allow empty WPA passphrase.

diff --git a/debian/changelog b/debian/changelog
index 585b100..2b55645 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-network (0.3.4) unstable; urgency=low
+
+  * Do not allow empty WPA passphrase. [Closes: issue846]
+
+ -- Michael Prokop <mika@grml.org>  Tue, 18 May 2010 14:24:17 +0200
+

 grml-network (0.3.3) unstable; urgency=low
 
   * Add iptables to Recommends.
 grml-network (0.3.3) unstable; urgency=low
 
   * Add iptables to Recommends.

diff --git a/sbin/netcardconfig b/sbin/netcardconfig
index 40252b7..0b2d89e 100755 (executable)
--- a/sbin/netcardconfig
+++ b/sbin/netcardconfig
@@ -325,7 +325,12 @@ configiface() {
                           }
                   }
                   ' /etc/network/interfaces)
                           }
                   }
                   ' /etc/network/interfaces)

-          $DIALOG --inputbox "$MESSAGEW23 $ESSID" 15 50 "$WPASECRET" 2>"$TMP" || bailout 1
+          while [ -z "$WPASECRET" ] ; do
+            $DIALOG --inputbox "$MESSAGEW23 $ESSID" 15 50 "$WPASECRET" 2>"$TMP" || bailout 1
+            if [ -z "$WPASECRET" ] ; then
+              $DIALOG --msgbox "Sorry, empty password not allowed, please retry." 0 0 || bailout 1
+            fi
+          done

 
           # make sure backslashes inside passphrase are handled correct
           WPASECRET=$(sed -e 's/\\/\\/g' "$TMP") && rm -r "$TMP"
 
           # make sure backslashes inside passphrase are handled correct
           WPASECRET=$(sed -e 's/\\/\\/g' "$TMP") && rm -r "$TMP"