Skip to content
This repository was archived by the owner on Dec 16, 2017. It is now read-only.

fixing config options #177

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixing config options #177

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions maltrieve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'):
Expand Down