Minor layout adjustments

bdamele · bdamele · commit e28b98a3662a · 2009-12-02T22:52:17.000Z
diff --git a/lib/takeover/metasploit.py b/lib/takeover/metasploit.py
@@ -193,9 +193,9 @@ def __selectEncoder(self, encode=True):
     def __selectPayload(self, askChurrasco=True):
         if kb.os == "Windows" and conf.privEsc == True:
             infoMsg  = "forcing Metasploit payload to Meterpreter because "
-            infoMsg += "it is the only payload that can be used to abuse "
-            infoMsg += "Windows Impersonation Tokens via Meterpreter "
-            infoMsg += "'incognito' extension to privilege escalate"
+            infoMsg += "it is the only payload that can abuse Windows "
+            infoMsg += "Access Tokens via Meterpreter 'incognito' "
+            infoMsg += "extension to privilege escalate"
             logger.info(infoMsg)
 
             __payloadStr = "windows/meterpreter"
@@ -224,15 +224,15 @@ def __selectPayload(self, askChurrasco=True):
                 choose = True
 
                 warnMsg  = "it is unlikely that the VNC injection will be "
-                warnMsg += "successful because often Microsoft SQL Server "
+                warnMsg += "successful because usually Microsoft SQL Server "
                 warnMsg += "%s runs as Network Service " % kb.dbmsVersion[0]
                 warnMsg += "or the Administrator is not logged in"
                 logger.warn(warnMsg)
 
             if choose == True:
                 message  = "what do you want to do?\n"
                 message += "[1] Give it a try anyway\n"
-                message += "[2] Fall back to reflective Meterpreter payload (default)\n"
+                message += "[2] Fall back to Meterpreter payload (default)\n"
                 message += "[3] Fall back to Shell payload"
 
                 while True:
@@ -572,8 +572,8 @@ def createMsfShellcode(self, exitfunc, format, extra, encode):
             errMsg = "failed to create the shellcode (%s)" % payloadStderr.replace("\n", "")
             raise sqlmapFilePathException, errMsg
 
-        self.__shellcodeFP     = open(self.__shellcodeFilePath, "rb")
-        self.shellcodeString   = self.__shellcodeFP.read()
+        self.__shellcodeFP   = open(self.__shellcodeFilePath, "rb")
+        self.shellcodeString = self.__shellcodeFP.read()
         self.__shellcodeFP.close()
 
         os.unlink(self.__shellcodeFilePath)
