Merge branch 'upstream' into debian-release

* upstream:
  - Patch to make log file descriptors cloexec to stop leaking file descriptors on
  - Changed to SVN version.
debian-releases/squeeze
Yaroslav Halchenko 2010-02-25 00:17:02 -05:00
commit 47fae42a3b
2 changed files with 5 additions and 2 deletions

View File

@ -24,4 +24,4 @@ __date__ = "$Date: 2009-09-07 21:13:45 +0200 (Mon, 07 Sep 2009) $"
__copyright__ = "Copyright (c) 2004 Cyril Jaquier"
__license__ = "GPL"
version = "0.8.4"
version = "0.8.4-SVN"

View File

@ -31,7 +31,7 @@ from datedetector import DateDetector
from mytime import MyTime
from failregex import FailRegex, Regex, RegexException
import logging, re, os
import logging, re, os, fcntl
# Gets the instance of the logger.
logSys = logging.getLogger("fail2ban.filter")
@ -469,6 +469,9 @@ class FileContainer:
def open(self):
self.__handler = open(self.__filename)
# Set the file descriptor to be FD_CLOEXEC
fd = self.__handler.fileno()
fcntl.fcntl(fd, fcntl.F_SETFD, fd | fcntl.FD_CLOEXEC)
firstLine = self.__handler.readline()
# Computes the MD5 of the first line.
myHash = md5.new(firstLine).digest()