diff --git a/client/jailreader.py b/client/jailreader.py index cf1e0109..618320c2 100644 --- a/client/jailreader.py +++ b/client/jailreader.py @@ -61,11 +61,11 @@ class JailReader(ConfigReader): def getOptions(self): opts = [["bool", "enabled", "false"], ["string", "logpath", "/var/log/messages"], - ["string", "use_dns", "warn"], ["string", "backend", "auto"], ["int", "maxretry", 3], ["int", "findtime", 600], ["int", "bantime", 600], + ["string", "use_dns", "warn"], ["string", "failregex", None], ["string", "ignoreregex", None], ["string", "ignoreip", None], @@ -123,6 +123,9 @@ class JailReader(ConfigReader): stream.append(["set", self.__name, "findtime", self.__opts[opt]]) elif opt == "bantime": stream.append(["set", self.__name, "bantime", self.__opts[opt]]) + elif opt == "use_dns": + logSys.debug("USE_DNS: In jailreader.convert") + stream.append(["set", self.__name, "use_dns", self.__opts[opt]]) elif opt == "failregex": stream.append(["set", self.__name, "addfailregex", self.__opts[opt]]) elif opt == "ignoreregex": diff --git a/server/filter.py b/server/filter.py index e4c5e86b..a08ba640 100644 --- a/server/filter.py +++ b/server/filter.py @@ -147,13 +147,14 @@ class Filter(JailThread): def setUseDns(self, value): self.__useDns = value - logSys.info("Set use_dns = %s" % value) + logSys.info("USE_DNS: Set use_dns = %s" % value) ## # Get the use_dns mode # @return the use_dns mode def getUseDns(self): + logSys.debug("USE_DNS: Get use_dns = %s" % self.__useDns) return self.__useDns ## @@ -584,13 +585,13 @@ class DNSUtils: def textToIp(text, useDns): """ Return the IP of DNS found in a given text. """ - logSys.debug("Checking rDNS: %s" % text) - logSys.debug("DNS use_dns == %s" % useDns) + logSys.debug("USE_DNS: Checking rDNS: %s" % text) + logSys.debug("USE_DNS: DNS use_dns == %s" % useDns) if useDns == "no": - logSys.debug("use_dns == no") + logSys.debug("USE_DNS: use_dns == no") return None else: - logSys.debug("use_dns != no") + logSys.debug("USE_DNS: use_dns != no") ipList = list() # Search for plain IP plainIP = DNSUtils.searchIP(text) diff --git a/server/server.py b/server/server.py index b734f82a..c7537743 100644 --- a/server/server.py +++ b/server/server.py @@ -205,9 +205,11 @@ class Server: return self.__jails.getFilter(name).getIgnoreRegex() def setUseDns(self, name, value): + logSys.debug("USE_DNS: in server.setUseDns: %s" % value) self.__jails.getFilter(name).setUseDns(value) def getUseDns(self, name): + logSys.debug("USE_DNS: in server.getUseDns: %s" % name) return self.__jails.getFilter(name).getUseDns() def setMaxRetry(self, name, value):