--- libchipcard-4.0.0/etc/chipcardd~	2007-10-31 22:39:01.000000000 +0100
+++ libchipcard-4.0.0/etc/chipcardd	2007-11-23 09:36:48.000000000 +0100
@@ -20,6 +20,10 @@
 #		by Ian Murdock <imurdock@gnu.ai.mit.edu>.
 #
 
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/chipcardd4
 PIDFILE=/var/run/chipcardd4.pid
@@ -29,8 +33,6 @@ DESC="libchipcard daemon"
 
 test -x $DAEMON || exit 0
 
-set -e
-
 check_var_run() {
   if [ ! -d /var/run/chipcard ] ; then
     mkdir -p /var/run/chipcard
@@ -41,29 +43,47 @@ case "$1" in
   start)
 	echo -n "Starting $DESC: "
 	check_var_run
-	start-stop-daemon --start --quiet --pidfile $PIDFILE \
-		--exec $DAEMON -- $DAEMON_ARGS
-	echo "$NAME."
+	daemon --pidfile $PIDFILE \
+		$DAEMON "$DAEMON_ARGS" > /dev/null 2>&1
+        RETVAL=$?
+	if [ $RETVAL -eq 0 ]; then
+	       touch /var/lock/subsys/$NAME
+	       success " "
+        else
+	       failure " "
+        fi
+        echo
 	;;
   stop)
 	echo -n "Stopping $DESC: "
-	start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE
-	echo "$NAME."
+	killproc -p $PIDFILE $NAME
+        RETVAL=$?
+	echo
+	if [ $RETVAL -eq 0 ]; then
+		rm -f /var/lock/subsys/$NAME
+        	rm -f $PIDFILE
+	fi
 	;;
   reload)
 	echo "Reloading $DESC configuration files."
-	start-stop-daemon --stop --signal 1 --quiet --pidfile \
-		$PIDFILE --exec $DAEMON
+	killproc $NAME -1
+        echo
 	;;
   restart|force-reload)
 	echo -n "Restarting $DESC: "
-	start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
-		--exec $DAEMON
+	killproc -p $PIDFILE $NAME
 	sleep 1
 	check_var_run
-	start-stop-daemon --start --quiet --pidfile $PIDFILE \
-		--exec $DAEMON -- $DAEMON_ARGS
-	echo "$NAME."
+	daemon --pidfile $PIDFILE \
+		$DAEMON $DAEMON_ARGS > /dev/null 2>&1
+        RETVAL=$?
+	echo
+	if [ $RETVAL -eq 0 ]; then
+		success " "
+		touch /var/lock/subsys/$NAME
+	else
+		failure " "
+	fi
 	;;
   *)
 	N=$0