diff --git a/lib/controller/checks.py b/lib/controller/checks.py index d4d684070..be9dc5c8b 100644 --- a/lib/controller/checks.py +++ b/lib/controller/checks.py @@ -61,8 +61,8 @@ from lib.core.threads import getCurrentThreadData from lib.request.connect import Connect as Request from lib.request.inject import checkBooleanExpression from lib.request.templates import getPageTemplate -from lib.techniques.inband.union.test import unionTest -from lib.techniques.inband.union.use import configUnion +from lib.techniques.union.test import unionTest +from lib.techniques.union.use import configUnion def checkSqlInjection(place, parameter, value): # Store here the details about boundaries and payload used to diff --git a/lib/request/inject.py b/lib/request/inject.py index 13f5dfe43..2f488a060 100644 --- a/lib/request/inject.py +++ b/lib/request/inject.py @@ -45,7 +45,7 @@ from lib.core.threads import getCurrentThreadData from lib.core.unescaper import unescaper from lib.request.connect import Connect as Request from lib.request.direct import direct -from lib.techniques.inband.union.use import unionUse +from lib.techniques.union.use import unionUse from lib.techniques.blind.inference import bisection from lib.techniques.error.use import errorUse from lib.utils.resume import queryOutputLength diff --git a/lib/techniques/inband/union/__init__.py b/lib/techniques/inband/union/__init__.py deleted file mode 100644 index 70b6d1cc2..000000000 --- a/lib/techniques/inband/union/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env python - -""" -$Id$ - -Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/) -See the file 'doc/COPYING' for copying permission -""" - -pass diff --git a/lib/techniques/inband/__init__.py b/lib/techniques/union/__init__.py similarity index 100% rename from lib/techniques/inband/__init__.py rename to lib/techniques/union/__init__.py diff --git a/lib/techniques/inband/union/test.py b/lib/techniques/union/test.py similarity index 100% rename from lib/techniques/inband/union/test.py rename to lib/techniques/union/test.py diff --git a/lib/techniques/inband/union/use.py b/lib/techniques/union/use.py similarity index 100% rename from lib/techniques/inband/union/use.py rename to lib/techniques/union/use.py diff --git a/plugins/dbms/mysql/filesystem.py b/plugins/dbms/mysql/filesystem.py index a8da89db8..6973fed22 100644 --- a/plugins/dbms/mysql/filesystem.py +++ b/plugins/dbms/mysql/filesystem.py @@ -15,7 +15,7 @@ from lib.core.data import logger from lib.core.enums import PLACE from lib.core.exception import sqlmapNoneDataException from lib.request import inject -from lib.techniques.inband.union.use import unionUse +from lib.techniques.union.use import unionUse from plugins.generic.filesystem import Filesystem as GenericFilesystem