Finished Mac OS X

bdamele · bdamele · commit ccedadd780f0 · 2009-04-30T21:42:54.000Z
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -258,22 +258,16 @@ 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 "linux" in PLATFORM or "darwin" in PLATFORM:
+            isAdmin = os.geteuid()
 
-            if isinstance(isAdmin, (int, float, long)) and isAdmin == 1:
+            if isinstance(isAdmin, (int, float, long)) and isAdmin == 0:
                 isAdmin = True
 
-        elif "linux" in PLATFORM:
-            isAdmin = os.geteuid()
+        elif "win" in PLATFORM:
+            isAdmin = ctypes.windll.shell32.IsUserAnAdmin()
 
-            if isinstance(isAdmin, (int, float, long)) and isAdmin == 0:
+            if isinstance(isAdmin, (int, float, long)) and isAdmin == 1:
                 isAdmin = True
 
         else:
