/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-08 01:17:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080808011717-h1vzp4vs7oyzkgx3
* mandos (IPv6_TCPServer.server_bind): Bug fix: allow port to be empty
                                       as well as None.
  (main): Bug fix: Let debug option default to 'None' to allow
          override from config file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
528
528
                in6addr_any = "::"
529
529
                self.server_address = (in6addr_any,
530
530
                                       self.server_address[1])
531
 
            elif self.server_address[1] is None:
 
531
            elif not self.server_address[1]:
532
532
                self.server_address = (self.server_address[0],
533
533
                                       0)
 
534
#                 if self.settings["interface"]:
 
535
#                     self.server_address = (self.server_address[0],
 
536
#                                            0, # port
 
537
#                                            0, # flowinfo
 
538
#                                            if_nametoindex
 
539
#                                            (self.settings
 
540
#                                             ["interface"]))
534
541
            return super(type(self), self).server_bind()
535
542
 
536
543
 
652
659
                      help="Port number to receive requests on")
653
660
    parser.add_option("--check", action="store_true", default=False,
654
661
                      help="Run self-test")
655
 
    parser.add_option("--debug", action="store_true", default=False,
 
662
    parser.add_option("--debug", action="store_true",
656
663
                      help="Debug mode; run in foreground and log to"
657
664
                      " terminal")
658
665
    parser.add_option("--priority", type="string", help="GnuTLS"