/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: 2013-10-22 19:46:35 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 305.
  • Revision ID: teddy@recompile.se-20131022194635-ll6jyg1snrxwe94o
* TODO

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
88
88
    except ImportError:
89
89
        SO_BINDTODEVICE = None
90
90
 
91
 
version = "1.6.2"
 
91
version = "1.6.1"
92
92
stored_state_file = "clients.pickle"
93
93
 
94
94
logger = logging.getLogger()
690
690
        # If a checker exists, make sure it is not a zombie
691
691
        try:
692
692
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
693
 
        except AttributeError:
694
 
            pass
695
 
        except OSError as error:
696
 
            if error.errno != errno.ECHILD:
697
 
                raise
 
693
        except (AttributeError, OSError) as error:
 
694
            if (isinstance(error, OSError)
 
695
                and error.errno != errno.ECHILD):
 
696
                raise error
698
697
        else:
699
698
            if pid:
700
699
                logger.warning("Checker was a zombie")
1703
1702
            logger.debug("Protocol version: %r", line)
1704
1703
            try:
1705
1704
                if int(line.strip().split()[0]) > 1:
1706
 
                    raise RuntimeError(line)
 
1705
                    raise RuntimeError
1707
1706
            except (ValueError, IndexError, RuntimeError) as error:
1708
1707
                logger.error("Unknown protocol version: %s", error)
1709
1708
                return
1916
1915
    
1917
1916
    def add_pipe(self, parent_pipe, proc):
1918
1917
        """Dummy function; override as necessary"""
1919
 
        raise NotImplementedError()
 
1918
        raise NotImplementedError
1920
1919
 
1921
1920
 
1922
1921
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2259
2258
            else:
2260
2259
                raise ValueError("Unknown suffix {0!r}"
2261
2260
                                 .format(suffix))
2262
 
        except IndexError as e:
 
2261
        except (ValueError, IndexError) as e:
2263
2262
            raise ValueError(*(e.args))
2264
2263
        timevalue += delta
2265
2264
    return timevalue
2458
2457
                                        or None))
2459
2458
    if not foreground:
2460
2459
        pidfilename = "/run/mandos.pid"
2461
 
        if not os.path.isdir("/run/."):
2462
 
            pidfilename = "/var/run/mandos.pid"
2463
2460
        pidfile = None
2464
2461
        try:
2465
2462
            pidfile = open(pidfilename, "w")
2482
2479
        os.setuid(uid)
2483
2480
    except OSError as error:
2484
2481
        if error.errno != errno.EPERM:
2485
 
            raise
 
2482
            raise error
2486
2483
    
2487
2484
    if debug:
2488
2485
        # Enable all possible GnuTLS debugging
2793
2790
            else:
2794
2791
                logger.warning("Could not save persistent state:",
2795
2792
                               exc_info=e)
2796
 
                raise
 
2793
                raise e
2797
2794
        
2798
2795
        # Delete all clients, and settings from config
2799
2796
        while tcp_server.clients: