freeswan-init.patch

   1 --- freeswan-1.97/utils/setup   Wed Jun 20 17:55:13 2001
   2 +++ freeswan-1.97/utils/setup.org       Thu May  2 12:08:39 2002
   3 @@ -30,7 +30,25 @@
   4  # description: IPsec provides encrypted and authenticated communications; \
   5  # KLIPS is the kernel half of it, Pluto is the user-level management daemon.
   6
   7 -me='ipsec setup'               # for messages
   8 +# Source function library
   9 +. /etc/rc.d/init.d/functions
  10 +
  11 +# Get network config
  12 +. /etc/sysconfig/network
  13 +
  14 +# Check that networking is up.
  15 +if is_yes "${NETWORKING}"; then
  16 +       if [ ! -f /var/lock/subsys/network ]; then
  17 +               # nls "ERROR: Networking is down. %s can't be run." ipsec
  18 +               msg_network_down ipsec
  19 +               exit 1
  20 +       fi
  21 +else
  22 +       exit 0
  23 +fi
  24 +
  25 +me='ipsec setup'               # for messages
  26 +
  27
  28
  29
  30 @@ -54,7 +72,7 @@
  31  if ! test "$found"
  32  then
  33         echo "cannot find ipsec command -- \`$1' aborted" |
  34 -               logger -s -p daemon.error -t ipsec_setup
  35 +           logger -p daemon.error -t ipsec_setup
  36         exit 1
  37  fi
  38
  39 @@ -65,7 +83,7 @@
  40  if test " $IPSEC_confreadstatus" != " "
  41  then
  42         echo "$IPSEC_confreadstatus -- \`$1' aborted" |
  43 -               logger -s -p daemon.error -t ipsec_setup
  44 +           logger -p daemon.error -t ipsec_setup
  45         exit 1
  46  fi
  47  IPSECsyslog=${IPSECsyslog-daemon.error}
  48 @@ -78,23 +96,79 @@
  49
  50  # do it
  51  case "$1" in
  52 -  start|--start|stop|--stop|_autostop|_autostart)
  53 -       if test " `id -u`" != " 0"
  54 -       then
  55 -               echo "permission denied (must be superuser)" |
  56 -                       logger -s -p $IPSECsyslog -t ipsec_setup 2>&1
  57 -               exit 1
  58 +             start|--start|_autostart)
  59 +                  # Check if the service is already running?
  60 +                  if [ ! -f /var/lock/subsys/ipsec ]; then
  61 +                          # show "Starting %s service" ipsec
  62 +                          msg_starting ipsec
  63 +                          busy
  64 +                          if test " `id -u`" != " 0"
  65 +                          then
  66 +                              echo "permission denied (must be superuser)" |
  67 +                                  logger -p $IPSECsyslog -t ipsec_setup 2>&1
  68 +                              fail
  69 +                              exit 1
  70 +                          fi
  71 +                          {
  72 +                              ipsec _realsetup $1 ;
  73 +                              RETVAL=$?;
  74 +                          } 2>&1 | logger -p $IPSECsyslog -t ipsec_setup 2>&1
  75 +
  76 +                          if [ "$RETVAL" -eq 0 ];
  77 +                          then
  78 +                              touch /var/lock/subsys/ipsec
  79 +                              ok
  80 +                              exit $RETVAL;
  81 +                          fi
  82 +                          fail
  83 +                          exit $RETVAL
  84 +
  85 +                  else
  86 +                          # show "%s service is already running." ipsec
  87 +                          msg_already_running ipsec
  88 +
  89 +
  90 +
  91 +       exit 1
  92         fi
  93 -       tmp=/var/run/ipsec_setup.st
  94 -       (
  95 -               ipsec _realsetup $1
  96 -               echo "$?" >$tmp
  97 -       ) 2>&1 | logger -s -p $IPSECsyslog -t ipsec_setup 2>&1
  98 -       st=`cat $tmp`
  99 -       rm -f $tmp
 100 -       exit $st
 101         ;;
 102 -
 103 +             stop|--stop|_autostop)
 104 +                   # Stop daemons.
 105 +                   # show "Stopping %s service" ipsec
 106 +                  if [ -f /var/lock/subsys/ipsec ]; then
 107 +                          msg_stopping ipsec
 108 +                          busy
 109 +                          if test " `id -u`" != " 0"
 110 +                          then
 111 +                              echo "permission denied (must be superuser)" |
 112 +                                  logger -p $IPSECsyslog -t ipsec_setup 2>&1
 113 +                              fail
 114 +                              exit 1
 115 +                          fi
 116 +                          {
 117 +                              ipsec _realsetup $1 ;
 118 +                              RETVAL=$?;
 119 +                          } 2>&1 | logger -p $IPSECsyslog -t ipsec_setup 2>&1
 120 +
 121 +                          rm -f /var/lock/subsys/ipsec
 122 +
 123 +                          if [ "$RETVAL" -eq 0 ];
 124 +                          then
 125 +                              ok
 126 +                              exit $RETVAL;
 127 +                          fi
 128 +                          fail
 129 +                          exit $RETVAL
 130 +                  else
 131 +                          # show "%s service is not running." ipsec
 132 +                          msg_not_running ipsec
 133 +                          exit 1
 134 +                  fi
 135 +                  ;;
 136 +
 137 +
 138 +
 139 +
 140    restart|--restart)
 141         $0 stop
 142         $0 start