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

  • Committer: Teddy Hogeborn
  • Date: 2009-01-05 23:26:06 UTC
  • mfrom: (237.2.11 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20090105232606-2iohqjcsfj076z7i
Merge from trunk, but disable the unfinished D-Bus feature:

* Makefile (PROGS): Removed "mandos-list".
  (mandos-list): Removed.
* mandos (main): Hide "--no-dbus" option.  Hard-code "use_dbus" to
                 "False".
* mandos-list: Removed.
* mandos.xml (SYNOPSIS): Removed "--no-dbus" option.
  (OPTIONS): - '' -
  (D-BUS INTERFACE): Removed section.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
35
35
 
36
36
import SocketServer
37
37
import socket
38
 
from optparse import OptionParser
 
38
import optparse
39
39
import datetime
40
40
import errno
41
41
import gnutls.crypto
889
889
 
890
890
 
891
891
def main():
892
 
    parser = OptionParser(version = "%%prog %s" % version)
 
892
    parser = optparse.OptionParser(version = "%%prog %s" % version)
893
893
    parser.add_option("-i", "--interface", type="string",
894
894
                      metavar="IF", help="Bind to interface IF")
895
895
    parser.add_option("-a", "--address", type="string",
911
911
                      " files")
912
912
    parser.add_option("--no-dbus", action="store_false",
913
913
                      dest="use_dbus",
914
 
                      help="Do not provide D-Bus system bus"
915
 
                      " interface")
 
914
                      help=optparse.SUPPRESS_HELP)
916
915
    options = parser.parse_args()[0]
917
916
    
918
917
    if options.check:
958
957
    # For convenience
959
958
    debug = server_settings["debug"]
960
959
    use_dbus = server_settings["use_dbus"]
 
960
    use_dbus = False
961
961
    
962
962
    if not debug:
963
963
        syslogger.setLevel(logging.WARNING)