From e14f384ba2eeff75abbc2065b0a403ebb1c9bda3 Mon Sep 17 00:00:00 2001 From: Jonathan Respeto Date: Thu, 30 Jul 2015 11:48:13 -0400 Subject: [PATCH] fixing config options --- maltrieve.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/maltrieve.py b/maltrieve.py index 37f04e5..8ad4b44 100755 --- a/maltrieve.py +++ b/maltrieve.py @@ -117,9 +117,12 @@ def __init__(self, args, filename='maltrieve.cfg'): self.logheaders = self.configp.get('Maltrieve', 'logheaders') # TODO: Merge these - self.vxcage = args.vxcage or self.configp.has_option('Maltrieve', 'vxcage') - self.cuckoo = args.cuckoo or self.configp.has_option('Maltrieve', 'cuckoo') - self.viper = args.viper or self.configp.has_option('Maltrieve', 'viper') + if args.vxcage or self.configp.has_option('Maltrieve', 'vxcage'): + self.vxcage = self.configp.get('Maltrieve', 'vxcage') + if args.cuckoo or self.configp.has_option('Maltrieve', 'cuckoo'): + self.cuckoo = self.configp.get('Maltrieve', 'cuckoo') + if args.viper or self.configp.has_option('Maltrieve', 'viper'): + self.viper = self.configp.get('Maltrieve', 'viper') # CRITs if args.crits or self.configp.has_option('Maltrieve', 'crits'):