From ccedadd780f0decc037c295f6e95fdd562baecbd Mon Sep 17 00:00:00 2001 From: Bernardo Damele Date: Thu, 30 Apr 2009 21:42:54 +0000 Subject: [PATCH] Finished Mac OS X --- lib/core/option.py | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/lib/core/option.py b/lib/core/option.py index 8626be0ce..a9760a1f1 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -258,24 +258,18 @@ def __setMetasploit(): if conf.osSmb: isAdmin = False - # TODO: add support for Mac OS X - #if "darwin" in PLATFORM: - # pass - # - #elif "win" in PLATFORM: - - if "win" in PLATFORM: - isAdmin = ctypes.windll.shell32.IsUserAnAdmin() - - if isinstance(isAdmin, (int, float, long)) and isAdmin == 1: - isAdmin = True - - elif "linux" in PLATFORM: + if "linux" in PLATFORM or "darwin" in PLATFORM: isAdmin = os.geteuid() if isinstance(isAdmin, (int, float, long)) and isAdmin == 0: isAdmin = True + elif "win" in PLATFORM: + isAdmin = ctypes.windll.shell32.IsUserAnAdmin() + + if isinstance(isAdmin, (int, float, long)) and isAdmin == 1: + isAdmin = True + else: warnMsg = "sqlmap is not able to check if you are running it " warnMsg += "as an Administrator accout on this platform. "