From b299a344ced3a974d74e92da824180052d4c3360 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 17 Oct 2003 00:10:14 +0000
Subject: small fixes

git-svn-id: file:///home/lennart/svn/public/waproamd/trunk@28 022f378f-78c4-0310-b860-d162c87e6274
---
 conf/default.in    | 4 +++-
 configure.ac       | 2 +-
 doc/README.html.in | 6 +++++-
 src/waproamd.c     | 9 +++++----
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/conf/default.in b/conf/default.in
index 02bdca4..cad1268 100755
--- a/conf/default.in
+++ b/conf/default.in
@@ -47,7 +47,9 @@ case "$1.$METHOD" in
         ;;
     
     start.wep)
-        iwconfig $IFACE key "`cat $KEYDIR/$AP.wep`" [1] key restricted key [1] key on
+        KEY="$(cat $KEYDIR/$AP.wep)"
+        iwconfig $IFACE key [1] restricted $KEY
+        iwconfig $IFACE key on
         ;;
 
     *.open|stop.wep)
diff --git a/configure.ac b/configure.ac
index 7569c60..c3540d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
 AC_PREREQ(2.57)
-AC_INIT([waproamd], [0.3], [mzjncebnzq (at) 0pointer (dot) de])
+AC_INIT([waproamd], [0.3b], [mzjncebnzq (at) 0pointer (dot) de])
 AC_CONFIG_SRCDIR([src/waproamd.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign -Wall])
diff --git a/doc/README.html.in b/doc/README.html.in
index 558c47c..726dec3 100644
--- a/doc/README.html.in
+++ b/doc/README.html.in
@@ -42,6 +42,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</p>
 
 <h2><a name="news">News</a></h2>
 
+<div class="news-date">Fri Oct 17 2003: </div> <p class="news-text"><a
+href="@PACKAGE_URL@waproamd-0.3b.tar.gz">Version 0.3b</a> released,
+changes include: minor bug fixes.</p>
+
 <div class="news-date">Fri Oct 17 2003: </div> <p class="news-text"><a
 href="@PACKAGE_URL@waproamd-0.3.tar.gz">Version 0.3</a> released,
 changes include: split <tt><a href="http://0pointer.de/lennart/projects/aeswepd/"><tt>aeswepd</tt></a></tt> into its
@@ -152,7 +156,7 @@ for it.</p>
 
 <h2><a name="acks">Acknowledgements</a></h2>
 
-<p>None so far</p>
+<p>Thomas Hood for patches</p>
 
 <h2><a name="download">Download</a></h2>
 
diff --git a/src/waproamd.c b/src/waproamd.c
index 51532a8..33df905 100644
--- a/src/waproamd.c
+++ b/src/waproamd.c
@@ -594,12 +594,13 @@ void parse_args(int argc, char *argv[]) {
     if (_check) {
         pid_t pid = daemon_pid_file_is_running();
 
-        if (pid == (pid_t) -1)
+        if (pid == (pid_t) -1 || pid == 0) {
             printf("waproamd not running.\n");
-        else
+            exit(255);
+        } else {
             printf("waproamd process for device %s running as pid %u.\n", interface_name, pid);
-        
-        exit(pid == 0 ? 255 : 0);
+            exit(0);
+        }
     }
     
     if (!use_syslog) 
-- 
cgit