/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 dbus-mandos.conf

  • Committer: Teddy Hogeborn
  • Date: 2011-11-26 23:08:17 UTC
  • mto: (518.1.8 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 524.
  • Revision ID: teddy@recompile.se-20111126230817-tv08v831s2yltbkd
Make "enabled" a client config option.

* DBUS-API: Fix wording on "Expires" option.
* clients.conf (enabled): New.
* mandos (Client): "last_enabled" can now be None.
  (Client.__init__): Get "enabled" from config.  Only set
                     "last_enabled" and "expires" if enabled.
  (ClientDBus.Created_dbus_property): Removed redundant dbus.String().
  (ClientDBus.Interval_dbus_property): If changed, only reschedule
                                       checker if enabled.
  (main/special_settings): Added "enabled".
* mandos-clients.conf (OPTIONS): Added "enabled".

Show diffs side-by-side

added added

removed removed

Lines of Context:
dbus-mandos.conf
7
7
    <allow own="se.bsnet.fukt.Mandos"/>
8
8
    <allow send_destination="se.bsnet.fukt.Mandos"/>
9
9
    <allow receive_sender="se.bsnet.fukt.Mandos"/>
 
10
    <allow own="se.recompile.Mandos"/>
 
11
    <allow send_destination="se.recompile.Mandos"/>
 
12
    <allow receive_sender="se.recompile.Mandos"/>
10
13
  </policy>
11
14
  
12
15
  <policy user="root">
13
16
    <allow own="se.bsnet.fukt.Mandos"/>
14
17
    <allow send_destination="se.bsnet.fukt.Mandos"/>
15
18
    <allow receive_sender="se.bsnet.fukt.Mandos"/>
 
19
    <allow own="se.recompile.Mandos"/>
 
20
    <allow send_destination="se.recompile.Mandos"/>
 
21
    <allow receive_sender="se.recompile.Mandos"/>
16
22
  </policy>
17
23
 
18
24
</busconfig>