/mandos/release

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

« back to all changes in this revision

Viewing changes to network-hooks.d/wireless

* mandos (Client.runtime_expansions): Add "expires" and (bug fix)
                                      "last_approval_request".
  (main): Don't ignore SIGINT.
* mandos-clients.conf.xml (RUNTIME EXPANSION): Added "expires".

Show diffs side-by-side

added added

removed removed

Lines of Context:
35
35
    exit
36
36
fi
37
37
 
38
 
ifkeys=`sed -n -e 's/^ADDRESS_\([^=]*\)=.*/\1/p' "$CONFIG" | sort -u`
 
38
ifkeys=`env | sed -n -e 's/^ADDRESS_\([^=]*\)=.*/\1/p' "$CONFIG" \
 
39
    | sort -u`
39
40
 
40
41
# Exit if DEVICE is set and is not any of the wireless interfaces
41
42
if [ -n "$DEVICE" ]; then
43
44
        for KEY in $ifkeys; do
44
45
            ADDRESS=`eval 'echo "$ADDRESS_'"$KEY"\"`
45
46
            INTERFACE=`addrtoif "$ADDRESS"`
46
 
            
47
 
            case "$DEVICE" in
48
 
                *,"$INTERFACE"|*,"$INTERFACE",*|"$INTERFACE",*|"$INTERFACE")
49
 
                    break 2;;
50
 
            esac
 
47
            if [ "$INTERFACE" = "$DEVICE" ]; then
 
48
                break 2
 
49
            fi
51
50
        done
52
51
        exit
53
52
    done
123
122
        ROUTES=`eval 'echo "$ROUTES_'"$KEY"\"`
124
123
        if [ -n "$ROUTES" ]; then
125
124
            for route in $ROUTES; do
126
 
                "$ip" route add "$route" dev "$INTERFACE"
 
125
                "$ip" route add "$route" dev "$BRIDGE"
127
126
            done
128
127
        fi
129
128
    done