From 8f10023523f5ae5b8d37d8861dbecf8c55a56c84 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Thu, 29 Nov 2012 15:44:14 +0100 Subject: [PATCH] Fix for an Issue #266 --- lib/core/option.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/core/option.py b/lib/core/option.py index a6d513e6a..d520e715f 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -1972,7 +1972,7 @@ def __basicOptionValidation(): errMsg = "switch '--tor' is incompatible with option '--proxy'" raise sqlmapSyntaxException, errMsg - if conf.checkTor and not any([conf.tor, conf.proxy]): + if conf.checkTor and not any((conf.tor, conf.proxy)): errMsg = "switch '--check-tor' requires usage of switch '--tor' (or option '--proxy' with HTTP proxy address using Tor)" raise sqlmapSyntaxException, errMsg @@ -1988,8 +1988,8 @@ def __basicOptionValidation(): errMsg = "option '--dump-format' accepts one of following values: %s" % ", ".join(getPublicTypeMembers(DUMP_FORMAT, True)) raise sqlmapSyntaxException, errMsg - if conf.dumpFormat != defaults.dumpFormat and not conf.dumpTable: - errMsg = "option '--dump-format' requires usage of switch '--dump'" + if conf.dumpFormat != defaults.dumpFormat and not any((conf.dumpTable, conf.dumpAll)): + errMsg = "option '--dump-format' requires usage of switch '--dump' or '--dump-all'" raise sqlmapSyntaxException, errMsg if conf.skip and conf.testParameter: