From a723df613263f4668b44f3c6f4591378c14c2e48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20K=C3=A1cha?= <ph@cesnet.cz>
Date: Tue, 24 Mar 2015 13:27:37 +0100
Subject: [PATCH] * Fixed config comma typo * Included Warden client config -
can be both unicode or str
---
warden3/contrib/warden_filer/warden_filer.cfg | 2 +-
warden3/contrib/warden_filer/warden_filer.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/warden3/contrib/warden_filer/warden_filer.cfg b/warden3/contrib/warden_filer/warden_filer.cfg
index f522778..bf6e50c 100644
--- a/warden3/contrib/warden_filer/warden_filer.cfg
+++ b/warden3/contrib/warden_filer/warden_filer.cfg
@@ -44,7 +44,7 @@
"nogroup": null,
"tag": null,
"notag": ["Honeypot"]
- }
+ },
// Optional information about detector to be prepended into Idea Node array
"node": {
"Name": "cz.example.warden.test_receiver",
diff --git a/warden3/contrib/warden_filer/warden_filer.py b/warden3/contrib/warden_filer/warden_filer.py
index 13d5b2e..bb5207f 100644
--- a/warden3/contrib/warden_filer/warden_filer.py
+++ b/warden3/contrib/warden_filer/warden_filer.py
@@ -335,7 +335,7 @@ def get_configs():
# Allow inline or external Warden config
wconfig = config.get("warden", "warden_client.cfg")
- if isinstance(wconfig, str):
+ if isinstance(wconfig, basestring):
wconfig = read_cfg(wconfig)
fconfig = config.get(args.func, {})
--
GitLab