Cleaning some garbage (hard coded paths with linux native slashes)

stamparm · stamparm · commit 74552bea87d5 · 2013-01-07T16:51:00.000+01:00
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -919,7 +919,6 @@ def setPaths():
     paths.SQLMAP_OUTPUT_PATH = os.path.join(paths.SQLMAP_ROOT_PATH, "output")
     paths.SQLMAP_DUMP_PATH = os.path.join(paths.SQLMAP_OUTPUT_PATH, "%s", "dump")
     paths.SQLMAP_FILES_PATH = os.path.join(paths.SQLMAP_OUTPUT_PATH, "%s", "files")
-    paths.SQLMAP_SEXEC_PATH = os.path.join(paths.SQLMAP_EXTRAS_PATH, "shellcodeexec")
 
     # sqlmap files
     paths.SQLMAP_HISTORY = os.path.join(paths.SQLMAP_ROOT_PATH, ".sqlmap_history")
diff --git a/lib/takeover/metasploit.py b/lib/takeover/metasploit.py
@@ -534,12 +534,12 @@ def createMsfShellcode(self, exitfunc, format, extra, encode):
         os.unlink(self._shellcodeFilePath)
 
     def uploadShellcodeexec(self, web=False):
-        self.shellcodeexecLocal = paths.SQLMAP_SEXEC_PATH
+        self.shellcodeexecLocal = os.path.join(paths.SQLMAP_EXTRAS_PATH, "shellcodeexec")
 
         if Backend.isOs(OS.WINDOWS):
-            self.shellcodeexecLocal += "/windows/shellcodeexec.x%s.exe" % "32"
+            self.shellcodeexecLocal = os.path.join(self.shellcodeexecLocal, "windows", "shellcodeexec.x%s.exe" % "32")
         else:
-            self.shellcodeexecLocal += "/linux/shellcodeexec.x%s" % Backend.getArch()
+            self.shellcodeexecLocal = os.path.join(self.shellcodeexecLocal, "linux", "shellcodeexec.x%s" % Backend.getArch())
 
         __basename = "tmpse%s%s" % (self._randStr, ".exe" if Backend.isOs(OS.WINDOWS) else "")
 
