*** samhain	2011-04-01 13:13:25.000000000 -0500
--- samhain.updated	2011-04-01 13:40:44.000000000 -0500
***************
*** 19,24 ****
--- 19,26 ----
  DAEMON=${exec_prefix}/sbin/samhain
  NAME=samhain
  DESC="file integrity checker"
+ PIDDIR="/var/run/$NAME"
+ PIDFILE="$PIDDIR/$NAME.pid"
  
  test -f $DAEMON || exit 0
  
***************
*** 33,39 ****
  	if test -f /var/samhain/.samhain_lock; then
  	    rm -f /var/samhain/.samhain_lock
  	fi
!         start-stop-daemon --start --quiet --exec $DAEMON
          echo "$NAME."
  	#
  	# The hiding kernel module
--- 35,45 ----
  	if test -f /var/samhain/.samhain_lock; then
  	    rm -f /var/samhain/.samhain_lock
  	fi
! 	# We might have a tmpfs /var/run.
! 	if test ! -d $PIDDIR; then
! 		mkdir $PIDDIR
! 	fi
!         start-stop-daemon --start --quiet --exec $DAEMON --pidfile $PIDFILE
          echo "$NAME."
  	#
  	# The hiding kernel module
***************
*** 42,53 ****
          ;;
    stop)
          echo -n "Stopping $DESC: "
!         start-stop-daemon --stop --quiet --oknodo --exec $DAEMON
          echo "$NAME."
          ;;
    reload|force-reload)
          echo "Reloading $DESC configuration files."
!         start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON
    	;;
    restart)
          #
--- 48,59 ----
          ;;
    stop)
          echo -n "Stopping $DESC: "
!         start-stop-daemon --stop --quiet --oknodo --exec $DAEMON --pidfile $PIDFILE
          echo "$NAME."
          ;;
    reload|force-reload)
          echo "Reloading $DESC configuration files."
!         start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON --pidfile $PIDFILE
    	;;
    restart)
          #
***************
*** 56,64 ****
          #       just the same as "restart".
          #
          echo -n "Restarting $DESC: "
!         start-stop-daemon --stop --quiet --oknodo --exec $DAEMON
          sleep 3
!         start-stop-daemon --start --quiet --exec $DAEMON
          echo "$NAME."
          ;;
    *)
--- 62,70 ----
          #       just the same as "restart".
          #
          echo -n "Restarting $DESC: "
!         start-stop-daemon --stop --quiet --oknodo --exec $DAEMON --pidfile $PIDFILE
          sleep 3
!         start-stop-daemon --start --quiet --exec $DAEMON --pidfile $PIDFILE
          echo "$NAME."
          ;;
    *)