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

  • Committer: Teddy Hogeborn
  • Date: 2019-03-04 20:39:48 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 382.
  • Revision ID: teddy@recompile.se-20190304203948-x8cdobs47h1f89xk
mandos-ctl: Bug fix: fix client/properties confusion

* mandos-ctl (Command.run_on_one_client): Take an additional
                                          "properties" argument.  All
                                          callers and users changed.
  (IsEnabledCmd.is_enabled): Don't run client.Get(); just look at the
                             "Enabled" property key.
  (TestCmd.setUp): Set self.clients to the correct form of dict, and
                   set self.one_client to be a dict with only one
                   client.  Also set self.other_client to other client
                   object.  All users of these attributes changed.
  (TestCmd.setUp.MockClient.__getitem__): Removed.
  (TestCmd.setUp.MockClient.__setitem__): - '' -
  (TestIsEnabled.test_is_enabled_does_get_attribute): Removed.
  (TestIsEnabled.test_is_enabled_run_exits_with_failure): Don't use []
  to alter client attribute; modify client.attributes dict directly.
  (TestRemoveCmd.test_remove): Run on full client list.
  (TestApproveCmd.test_approve): - '' -
  (TestDenyCmd.test_approve): - '' - and rename to "test_deny".

Show diffs side-by-side

added added

removed removed

Lines of Context:
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