/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-01-29 22:22:32 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090129222232-p9hqnq338nsvxayp
* mandos (main): Bug fix: Do setgid before setuid.  Add verbose GnuTLS
                 debugging messages.
* plugins.d/mandos-client.c (main): Bug fix: Do setgid before setuid.

Show diffs side-by-side

added added

removed removed

Lines of Context:
699
699
            session.bye()
700
700
            return
701
701
        logger.debug(u"Fingerprint: %s", fpr)
 
702
        
702
703
        for c in self.server.clients:
703
704
            if c.fingerprint == fpr:
704
705
                client = c
790
791
 
791
792
def string_to_delta(interval):
792
793
    """Parse a string and return a datetime.timedelta
793
 
 
 
794
    
794
795
    >>> string_to_delta('7d')
795
796
    datetime.timedelta(7)
796
797
    >>> string_to_delta('60s')
1022
1023
                uid = 65534
1023
1024
                gid = 65534
1024
1025
    try:
 
1026
        os.setgid(gid)
1025
1027
        os.setuid(uid)
1026
 
        os.setgid(gid)
1027
1028
    except OSError, error:
1028
1029
        if error[0] != errno.EPERM:
1029
1030
            raise error
1030
1031
    
 
1032
    # Enable all possible GnuTLS debugging
 
1033
    if debug:
 
1034
        # "Use a log level over 10 to enable all debugging options."
 
1035
        # - GnuTLS manual
 
1036
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
1037
        
 
1038
        @gnutls.library.types.gnutls_log_func
 
1039
        def debug_gnutls(level, string):
 
1040
            logger.debug("GnuTLS: %s", string[:-1])
 
1041
        
 
1042
        (gnutls.library.functions
 
1043
         .gnutls_global_set_log_function(debug_gnutls))
 
1044
    
1031
1045
    global service
1032
1046
    service = AvahiService(name = server_settings["servicename"],
1033
1047
                           servicetype = "_mandos._tcp", )