/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: 2010-10-13 06:12:52 UTC
  • Revision ID: teddy@fukt.bsnet.se-20101013061252-3a918xedja5caya8
* debian/mandos-client.lintian-overrides: Added plugins.d/plymouth.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
81
81
        SO_BINDTODEVICE = None
82
82
 
83
83
 
84
 
version = "1.0.14"
 
84
version = "1.2.3"
85
85
 
86
86
#logger = logging.getLogger(u'mandos')
87
87
logger = logging.Logger(u'mandos')
1684
1684
    parser.add_option("--debug", action=u"store_true",
1685
1685
                      help=u"Debug mode; run in foreground and log to"
1686
1686
                      u" terminal")
1687
 
    parser.add_option("--debuglevel", type=u"string", metavar="Level",
 
1687
    parser.add_option("--debuglevel", type=u"string", metavar="LEVEL",
1688
1688
                      help=u"Debug level for stdout output")
1689
1689
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1690
1690
                      u" priority string (see GnuTLS documentation)")
1847
1847
        # No console logging
1848
1848
        logger.removeHandler(console)
1849
1849
    
 
1850
    # Need to fork before connecting to D-Bus
 
1851
    if not debug:
 
1852
        # Close all input and output, do double fork, etc.
 
1853
        daemon()
1850
1854
    
1851
1855
    global main_loop
1852
1856
    # From the Avahi example code
1870
1874
    if server_settings["interface"]:
1871
1875
        service.interface = (if_nametoindex
1872
1876
                             (str(server_settings[u"interface"])))
1873
 
 
1874
 
    if not debug:
1875
 
        # Close all input and output, do double fork, etc.
1876
 
        daemon()
1877
 
        
 
1877
    
1878
1878
    global multiprocessing_manager
1879
1879
    multiprocessing_manager = multiprocessing.Manager()
1880
1880