Fix for an --os-pwn with ICMPsh (it was crashing because methods interleaved with Metasploit ones)

stamparm · stamparm · commit 425df067eb07 · 2013-01-07T16:44:22.000+01:00
diff --git a/lib/takeover/icmpsh.py b/lib/takeover/icmpsh.py
@@ -45,8 +45,8 @@ def _selectLhost(self):
         return address
 
     def _prepareIngredients(self, encode=True):
-        self.lhostStr = self._selectLhost()
-        self.rhostStr = self._selectRhost()
+        self.lhostStr = ICMPsh._selectLhost(self)
+        self.rhostStr = ICMPsh._selectRhost(self)
 
     def _runIcmpshMaster(self):
         infoMsg = "running icmpsh master locally"
@@ -82,7 +82,7 @@ def uploadIcmpshSlave(self, web=False):
             self.writeFile(self._icmpslave, self._icmpslaveRemote, "binary")
 
     def icmpPwn(self):
-        self._prepareIngredients()
+        ICMPsh._prepareIngredients(self)
         self._runIcmpshSlaveRemote()
         self._runIcmpshMaster()
 
