/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 mandos-ctl

  • Committer: Teddy Hogeborn
  • Date: 2011-07-27 17:58:27 UTC
  • mto: (237.4.29 release)
  • mto: This revision was merged to the branch mainline in revision 490.
  • Revision ID: teddy@fukt.bsnet.se-20110727175827-nrd1ysjl4jrh6qw1
Tags: version-1.3.1-1
* Makefile (version): Changed to "1.3.1".
* NEWS (Version 1.3.1): New entry.
* debian/changelog (1.3.1-1): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
19
19
# You should have received a copy of the GNU General Public License
20
20
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
21
21
# 
22
 
# Contact the authors at <mandos@recompile.se>.
 
22
# Contact the authors at <mandos@fukt.bsnet.se>.
23
23
# 
24
24
 
25
25
from __future__ import (division, absolute_import, print_function,
52
52
    "ApprovalDelay": "Approval Delay",
53
53
    "ApprovalDuration": "Approval Duration",
54
54
    "Checker": "Checker",
55
 
    "ExtendedTimeout" : "Extended Timeout"
56
55
    }
57
56
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
58
 
domain = "se.recompile"
 
57
domain = "se.bsnet.fukt"
59
58
busname = domain + ".Mandos"
60
59
server_path = "/"
61
60
server_interface = domain + ".Mandos"
150
149
                options.remove,
151
150
                options.checker is not None,
152
151
                options.timeout is not None,
153
 
                options.extended_timeout is not None,
154
152
                options.interval is not None,
155
153
                options.approved_by_default is not None,
156
154
                options.approval_delay is not None,
187
185
                        help="Set checker command for client")
188
186
    parser.add_argument("-t", "--timeout",
189
187
                        help="Set timeout for client")
190
 
    parser.add_argument("--extended-timeout",
191
 
                        help="Set extended timeout for client")
192
188
    parser.add_argument("-i", "--interval",
193
189
                        help="Set checker interval for client")
194
190
    parser.add_argument("--approve-by-default", action="store_true",
274
270
                        "LastEnabled", "ApprovalPending",
275
271
                        "ApprovedByDefault",
276
272
                        "LastApprovalRequest", "ApprovalDelay",
277
 
                        "ApprovalDuration", "Checker",
278
 
                        "ExtendedTimeout")
 
273
                        "ApprovalDuration", "Checker")
279
274
        else:
280
275
            keywords = defaultkeywords
281
276
        
330
325
                           timedelta_to_milliseconds
331
326
                           (string_to_delta(options.timeout)),
332
327
                           dbus_interface=dbus.PROPERTIES_IFACE)
333
 
            if options.extended_timeout:
334
 
                client.Set(client_interface, "ExtendedTimeout",
335
 
                           timedelta_to_milliseconds
336
 
                           (string_to_delta(options.extended_timeout)),
337
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
338
328
            if options.secret:
339
329
                client.Set(client_interface, "Secret",
340
330
                           dbus.ByteArray(open(options.secret,