/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-11-29 20:30:21 UTC
  • mto: (518.1.13 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 524.
  • Revision ID: teddy@recompile.se-20111129203021-fzsq7sn15wysgqhd
* mandos (ClientDBus.approval_delay, ClientDBus.approval_duration,
  ClientDBus.timeout, ClientDBus.extended_timeout,
  ClientDBus.interval): Bug fix: Cast to correct D-Bus type.
* mandos-ctl (string_to_delta): Interpret unadorned numbers as
                                milliseconds.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
236
236
            #restore stderr
237
237
            os.dup2(stderrcopy, sys.stderr.fileno())
238
238
            os.close(stderrcopy)
239
 
    except dbus.exceptions.DBusException:
 
239
    except dbus.exceptions.DBusException, e:
240
240
        print("Access denied: Accessing mandos server through dbus.",
241
241
              file=sys.stderr)
242
242
        sys.exit(1)