/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to network-hooks.d/openvpn

  • Committer: teddy at bsnet
  • Date: 2011-12-25 00:40:09 UTC
  • Revision ID: teddy@fukt.bsnet.se-20111225004009-n5uimmac6h8djtv8
* plugin-runner.c (add_to_char_array): Added "nonnull" attribute.
  (add_argument): Added "nonnull" attribute on the "arg" argument.
  (add_environment): Added "nonnull" attribute on the "def" argument.
  (print_out_password, free_plugin): Added "nonnull" attribute.
  (main/parse_opt): Added "nonnull" attribute on the "state" argument.
* plugins.d/mandos-client.c (perror_plus): Bug fix; restore errno
                                           after fprintf().
* plugins.d/password-prompt.c (fprintf_plus): New.
 (conflict_detection/is_plymouth, main/parse_opt): Added "nonnull"
                                                   attribute.
 (conflict_detection/is_plymouth, conflict_detection, main): Bug fix;
                                                             Call
                                                             error_plus()
                                                             instead
                                                             of
                                                             error().
  (main/parse_opt): Added "nonnull" attribute on the "state" argument.
* plugins.d/plymouth.c (exec_and_wait): Added "nonnull" attribute on
                                        the "path" and "argv"
                                        arguments.
  (is_plymouth): Added "nonnull" attribute.

Show diffs side-by-side

added added

removed removed

Lines of Context:
network-hooks.d/openvpn
6
6
# configuration file(s) should be copied into the
7
7
# /etc/mandos/network-hooks.d directory.
8
8
# 
9
 
# Copyright © 2012 Teddy Hogeborn
10
 
# Copyright © 2012 Björn Påhlsson
11
 
# 
12
9
# Copying and distribution of this file, with or without modification,
13
10
# are permitted in any medium without royalty provided the copyright
14
11
# notice and this notice are preserved.  This file is offered as-is,
19
16
CONFIG="openvpn.conf"
20
17
 
21
18
# Extract the "dev" setting from the config file
22
 
VPNDEVICE=`sed -n -e 's/[[:space:]]#.*//' \
23
 
    -e 's/^[[:space:]]*dev[[:space:]]\+//p' \
24
 
    "$MANDOSNETHOOKDIR/$CONFIG"`
 
19
VPNDEVICE="`sed -n -e 's/#.*//' -e 's/^[[:space:]]*dev[[:space:]]\+//p' \"$MANDOSNETHOOKDIR/$CONFIG\"`"
25
20
 
26
21
PIDFILE=/run/openvpn-mandos.pid
27
22
 
31
26
fi
32
27
 
33
28
# Exit if DEVICE is set and it doesn't match the VPN interface
34
 
if [ -n "$DEVICE" ]; then
35
 
    case "$DEVICE" in
36
 
        *,"$VPNDEVICE"*|"$VPNDEVICE"*) :;;
37
 
        *) exit;;
38
 
    esac
 
29
if [ -n "$DEVICE" -a "$DEVICE" = "${DEVICE#$VPNDEVICE}" ]; then
 
30
    exit
39
31
fi
40
32
 
41
33
openvpn=/usr/sbin/openvpn
42
34
 
43
 
do_start(){
44
 
    "$openvpn" --cd "$MANDOSNETHOOKDIR" --daemon 'openvpn(Mandos)' \
45
 
        --writepid "$PIDFILE" --config "$CONFIG"
46
 
     sleep "$DELAY"
47
 
}
48
 
 
49
 
do_stop(){
50
 
    PID="`cat \"$PIDFILE\"`"
51
 
    if [ "$PID" -gt 0 ]; then
52
 
        kill "$PID"
53
 
    fi
54
 
}
55
 
 
56
 
case "${MODE:-$1}" in
57
 
    start|stop)
58
 
        do_"${MODE:-$1}"
 
35
case "$1" in
 
36
    start)
 
37
        "$openvpn" --cd "$MANDOSNETHOOKDIR" --daemon 'openvpn(Mandos)' --writepid "$PIDFILE" --config "$CONFIG"
 
38
        sleep "$DELAY"
 
39
        ;;
 
40
    stop)
 
41
        PID="`cat \"$PIDFILE\"`"
 
42
        if [ "$PID" -gt 0 ]; then
 
43
            kill "$PID"
 
44
        fi
59
45
        ;;
60
46
    files)
61
47
        echo "$openvpn"