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

  • Committer: Teddy Hogeborn
  • Date: 2019-03-30 21:23:59 UTC
  • Revision ID: teddy@recompile.se-20190330212359-z7u9ik1lh5auybhm
mandos-ctl: Refactor: fix confusion about values_to_set/values_to_get

* mandos-ctl (TestPropertySetterCmd.runTest): Generalize to work on
                                              any command regardless
                                              of what combination of
                                              values_to_set or
                                              values_to_get attributes
                                              it has.
  (TestPropertySetterCmd.run_command): Remove.
  (TestEnableCmd, TestDisableCmd, TestBumpTimeoutCmd,
  TestStartCheckerCmd, TestStopCheckerCmd, TestApproveByDefaultCmd,
  TestDenyByDefaultCmd): Change "values_to_set" to "values_to_get",
                         since that is what is intended.
  (TestPropertySetterValueCmd): Remove; all inheritors changed to
                                inherit from TestPropertySetterCmd.

Show diffs side-by-side

added added

removed removed

Lines of Context:
network-hooks.d/bridge
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
 
9
# Copyright © 2012-2018 Teddy Hogeborn
 
10
# Copyright © 2012-2018 Björn Påhlsson
11
11
# 
12
12
# Copying and distribution of this file, with or without modification,
13
13
# are permitted in any medium without royalty provided the copyright
29
29
    . "$CONFIG"
30
30
fi
31
31
 
32
 
if [ -z "$BRIDGE" -o -z "$PORT_ADDRESSES" ]; then
 
32
if [ -z "$BRIDGE" ] || [ -z "$PORT_ADDRESSES" ]; then
33
33
    exit
34
34
fi
35
35
 
36
 
if [ -n "$DEVICE" -a "$DEVICE" != "$BRIDGE" ]; then
37
 
    exit
 
36
if [ -n "$DEVICE" ]; then
 
37
    case "$DEVICE" in
 
38
        *,"$BRIDGE"|*,"$BRIDGE",*|"$BRIDGE",*|"$BRIDGE") :;;
 
39
        *) exit;;
 
40
    esac
38
41
fi
39
42
 
40
43
brctl="/sbin/brctl"