/mandos/trunk : revision 636

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: 2013-10-26 19:05:21 UTC
Revision ID: teddy@recompile.se-20131026190521-giagilisbyciox2h

Fall back to /var/run for pidfile if /run is not a directory.

This is for old (possibly non-Debian) systems which have not migrated
from /var/run to /run yet.

* init.d-mandos (PIDFILE): Fall back to /var/run/mandos.pid if /run is
not a directory.
* mandos (pidfilename): - '' -
* mandos.xml (FILES): Document fallback to /var/run/mandos.pid if /run
is not a directory.

Reported-by: Nathanael D. Noblet <nathanael@gnat.ca>
Suggested-by: Nathanael D. Noblet <nathanael@gnat.ca>

Show diffs side-by-side

added added

removed removed

mandos

# "AvahiService" class, and some lines in "main".

# Everything else is

# This program is free software: you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

except ImportError:

SO_BINDTODEVICE = None

version = "1.6.5"

version = "1.6.2"

stored_state_file = "clients.pickle"

logger = logging.getLogger()

syslogger = None

syslogger = (logging.handlers.SysLogHandler

(facility = logging.handlers.SysLogHandler.LOG_DAEMON,

address = str("/dev/log")))

try:

100

if_nametoindex = (ctypes.cdll.LoadLibrary

114

116

def initlogger(debug, level=logging.WARNING):

115

117

"""init logger and add loglevel"""

116

118

117

global syslogger

118

syslogger = (logging.handlers.SysLogHandler

119

(facility =

120

logging.handlers.SysLogHandler.LOG_DAEMON,

121

address = str("/dev/log")))

122

119

syslogger.setFormatter(logging.Formatter

123

120

('Mandos [%(process)d]: %(levelname)s:'

124

121

' %(message)s'))

693

690

# If a checker exists, make sure it is not a zombie

694

691

try:

695

692

pid, status = os.waitpid(self.checker.pid, os.WNOHANG)

696

except AttributeError:

697

pass

698

except OSError as error:

699

if error.errno != errno.ECHILD:

700

raise

693

except (AttributeError, OSError) as error:

694

if (isinstance(error, OSError)

695

and error.errno != errno.ECHILD):

696

raise error

701

697

else:

702

698

if pid:

703

699

logger.warning("Checker was a zombie")

937

933

# The byte_arrays option is not supported yet on

938

934

# signatures other than "ay".

939

935

if prop._dbus_signature != "ay":

940

raise ValueError("Byte arrays not supported for non-"

941

"'ay' signature {0!r}"

942

.format(prop._dbus_signature))

936

raise ValueError

943

937

value = dbus.ByteArray(b''.join(chr(byte)

944

938

for byte in value))

945

939

prop(value)

1353

1347

*args, **kwargs)

1354

1348

1355

1349

def start_checker(self, *args, **kwargs):

1356

old_checker_pid = getattr(self.checker, "pid", None)

1350

old_checker = self.checker

1351

if self.checker is not None:

1352

old_checker_pid = self.checker.pid

1353

else:

1354

old_checker_pid = None

1357

1355

r = Client.start_checker(self, *args, **kwargs)

1358

1356

# Only if new checker process was started

1359

1357

if (self.checker is not None

1704

1702

logger.debug("Protocol version: %r", line)

1705

1703

try:

1706

1704

if int(line.strip().split()[0]) > 1:

1707

raise RuntimeError(line)

1705

raise RuntimeError

1708

1706

except (ValueError, IndexError, RuntimeError) as error:

1709

1707

logger.error("Unknown protocol version: %s", error)

1710

1708

return

1917

1915

1918

1916

def add_pipe(self, parent_pipe, proc):

1919

1917

"""Dummy function; override as necessary"""

1920

raise NotImplementedError()

1918

raise NotImplementedError

1921

1919

1922

1920

1923

1921

class IPv6_TCPServer(MultiprocessingMixInWithPipe,

2260

2258

else:

2261

2259

raise ValueError("Unknown suffix {0!r}"

2262

2260

.format(suffix))

2263

except IndexError as e:

2261

except (ValueError, IndexError) as e:

2264

2262

raise ValueError(*(e.args))

2265

2263

timevalue += delta

2266

2264

return timevalue

2342

2340

2343

2341

if options.check:

2344

2342

import doctest

2345

fail_count, test_count = doctest.testmod()

2346

sys.exit(os.EX_OK if fail_count == 0 else 1)

2343

doctest.testmod()

2344

sys.exit()

2347

2345

2348

2346

# Default values for config file for server-global settings

2349

2347

server_defaults = { "interface": "",

2483

2481

os.setuid(uid)

2484

2482

except OSError as error:

2485

2483

if error.errno != errno.EPERM:

2486

raise

2484

raise error

2487

2485

2488

2486

if debug:

2489

2487

# Enable all possible GnuTLS debugging

2794

2792

else:

2795

2793

logger.warning("Could not save persistent state:",

2796

2794

exc_info=e)

2797

raise

2795

raise e

2798

2796

2799

2797

# Delete all clients, and settings from config

2800

2798

while tcp_server.clients:

Older »