/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

  • Committer: Teddy Hogeborn
  • Date: 2008-08-18 03:50:28 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080818035028-su31apqs2pv2147v
* mandos-keygen.xml: Removed <?xml-stylesheet>.  New entity
                     "&OVERVIEW;" referring to "overview.xml".
  (PURPOSE, OVERVIEW): New sections, same as in mandos(8).
  (EXAMPLES): Renamed to "EXAMPLE", as per man-pages(7).

* mandos.xml (OPTIONS, CLIENTS): Slight wording change.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
563
563
    datetime.timedelta(1)
564
564
    >>> string_to_delta(u'1w')
565
565
    datetime.timedelta(7)
566
 
    >>> string_to_delta('5m 30s')
567
 
    datetime.timedelta(0, 330)
568
566
    """
569
 
    timevalue = datetime.timedelta(0)
570
 
    for s in interval.split():
571
 
        try:
572
 
            suffix=unicode(s[-1])
573
 
            value=int(s[:-1])
574
 
            if suffix == u"d":
575
 
                delta = datetime.timedelta(value)
576
 
            elif suffix == u"s":
577
 
                delta = datetime.timedelta(0, value)
578
 
            elif suffix == u"m":
579
 
                delta = datetime.timedelta(0, 0, 0, 0, value)
580
 
            elif suffix == u"h":
581
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
582
 
            elif suffix == u"w":
583
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
584
 
            else:
585
 
                raise ValueError
586
 
        except (ValueError, IndexError):
 
567
    try:
 
568
        suffix=unicode(interval[-1])
 
569
        value=int(interval[:-1])
 
570
        if suffix == u"d":
 
571
            delta = datetime.timedelta(value)
 
572
        elif suffix == u"s":
 
573
            delta = datetime.timedelta(0, value)
 
574
        elif suffix == u"m":
 
575
            delta = datetime.timedelta(0, 0, 0, 0, value)
 
576
        elif suffix == u"h":
 
577
            delta = datetime.timedelta(0, 0, 0, 0, 0, value)
 
578
        elif suffix == u"w":
 
579
            delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
 
580
        else:
587
581
            raise ValueError
588
 
        timevalue += delta
589
 
    return timevalue
 
582
    except (ValueError, IndexError):
 
583
        raise ValueError
 
584
    return delta
590
585
 
591
586
 
592
587
def server_state_changed(state):
705
700
    server_config = ConfigParser.SafeConfigParser(server_defaults)
706
701
    del server_defaults
707
702
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
703
    server_section = "server"
708
704
    # Convert the SafeConfigParser object to a dict
709
 
    server_settings = server_config.defaults()
 
705
    server_settings = dict(server_config.items(server_section))
710
706
    # Use getboolean on the boolean config option
711
707
    server_settings["debug"] = server_config.getboolean\
712
 
                               ("DEFAULT", "debug")
 
708
                               (server_section, "debug")
713
709
    del server_config
714
710
    
715
711
    # Override the settings from the config file with command line
738
734
    client_defaults = { "timeout": "1h",
739
735
                        "interval": "5m",
740
736
                        "checker": "fping -q -- %%(host)s",
741
 
                        "host": "",
742
737
                        }
743
738
    client_config = ConfigParser.SafeConfigParser(client_defaults)
744
739
    client_config.read(os.path.join(server_settings["configdir"],