/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: 2009-05-24 23:36:15 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090524233615-ux63hgxddxl3c7l4
* debian/mandos-client.postinst (configure): Don't look for user and
                                             group with the old name
                                             if upgrading from a new
                                             enough version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
77
77
        SO_BINDTODEVICE = None
78
78
 
79
79
 
80
 
version = "1.0.14"
 
80
version = "1.0.11"
81
81
 
82
82
logger = logging.Logger(u'mandos')
83
83
syslogger = (logging.handlers.SysLogHandler
811
811
                    client = c
812
812
                    break
813
813
            else:
814
 
                ipc.write(u"NOTFOUND %s %s\n"
815
 
                          % (fpr, unicode(self.client_address)))
 
814
                ipc.write(u"NOTFOUND %s\n" % fpr)
816
815
                session.bye()
817
816
                return
818
817
            # Have to check if client.still_valid(), since it is
901
900
    def process_request(self, request, client_address):
902
901
        """Overrides and wraps the original process_request().
903
902
        
904
 
        This function creates a new pipe in self.pipe
 
903
        This function creates a new pipe in self.pipe 
905
904
        """
906
905
        self.pipe = os.pipe()
907
906
        super(ForkingMixInWithPipe,
1196
1195
                      help=u"Directory to search for configuration"
1197
1196
                      u" files")
1198
1197
    parser.add_option("--no-dbus", action=u"store_false",
1199
 
                      dest=u"use_dbus",
1200
 
                      help=optparse.SUPPRESS_HELP) # XXX: Not done yet
 
1198
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
 
1199
                      u" system bus interface")
1201
1200
    parser.add_option("--no-ipv6", action=u"store_false",
1202
1201
                      dest=u"use_ipv6", help=u"Do not use IPv6")
1203
1202
    options = parser.parse_args()[0]
1255
1254
    # For convenience
1256
1255
    debug = server_settings[u"debug"]
1257
1256
    use_dbus = server_settings[u"use_dbus"]
1258
 
    use_dbus = False            # XXX: Not done yet
1259
1257
    use_ipv6 = server_settings[u"use_ipv6"]
1260
1258
    
1261
1259
    if not debug: