/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/wireless

  • Committer: Teddy Hogeborn
  • Date: 2016-03-19 03:19:04 UTC
  • Revision ID: teddy@recompile.se-20160319031904-v76knawxxbef79xv
Client: Fix permissions on plugin helper directory.

The Makefile target "install-client-nokey" creates the plugin-helper
directory /usr/lib/<ARCH>/mandos/plugin-helpers as mode u=rwx,go=
(0700).  Make this also the case for the Debian package.  Also change
the Makefile so it does not install the plugin helper
"mandos-client-iprouteadddel" as setuid root; this is unnecessary and
was, due to dh_fixperms, never propagated to the Debian package
anyway.

* Makefile (install-client-nokey): Do not set setuid bit on
  "plugin-helpers/mandos-client-iprouteadddel".
* debian/mandos-client.postinst (configure): If older version, fix
  permissions on plugin helper directory.
* debian/rules (override_dh_fixperms-arch): Exclude plugin helper
  directory from dh_fixperms.

Show diffs side-by-side

added added

removed removed

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