From e023e0d233ca9dd90378f6a1703f6ac9b33d6402 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 7 Feb 2011 12:32:08 +0000 Subject: [PATCH] proper fix --- lib/core/common.py | 2 +- lib/takeover/xp_cmdshell.py | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index 7c155c64c..30beca713 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -1782,7 +1782,7 @@ def wasLastRequestDelayed(): return retVal else: - return threadData.lastQueryDuration - conf.timeSec + return (threadData.lastQueryDuration - conf.timeSec) >= 0 def adjustTimeDelay(lastQueryDuration, lowerStdLimit): """ diff --git a/lib/takeover/xp_cmdshell.py b/lib/takeover/xp_cmdshell.py index b0de43ff4..3b12cf4db 100644 --- a/lib/takeover/xp_cmdshell.py +++ b/lib/takeover/xp_cmdshell.py @@ -93,12 +93,7 @@ class xp_cmdshell: inject.goStacked(cmd) - delayed = wasLastRequestDelayed() - - if isinstance(delayed, bool): - return delayed - else: - return None + return wasLastRequestDelayed() def xpCmdshellForgeCmd(self, cmd): self.__randStr = randomStr(lowercase=True)