PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-11 10:19:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix calling Ndiff from Zenmap on OS X. http://seclists.org/nmap-dev/2016/q3/266

Browse Source
This commit is contained in:
dmiller
2016-09-09 00:53:45 +00:00
parent 0790885360
commit f607178541
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG
View File

@@ -1,5 +1,11 @@
# Nmap Changelog ($Id$); -*-text-*- # Nmap Changelog ($Id$); -*-text-*-
o [Zenmap] Fixed a bug in the Compare Scans window of Zenmap on OS X resulting
in this message instead of Ndiff output:
ImportError: dlopen(/Applications/Zenmap.app/Contents/Resources/lib/python2.7/lib-dynload/datetime.so, 2): no suitable image found. Did find:
/Applications/Zenmap.app/Contents/Resources/lib/python2.7/lib-dynload/datetime.so: mach-o, but wrong architecture
Reported by Kyle Gustafson. [Daniel Miller]
o [NSE][GH#369] New script: coap-resources grabs the list of available o [NSE][GH#369] New script: coap-resources grabs the list of available
resources from CoAP endpoints. [Mak Kolybabi] resources from CoAP endpoints. [Mak Kolybabi]

6
zenmap/zenmapCore/Diff.py
View File

@@ -166,11 +166,11 @@ class NdiffCommand(subprocess.Popen):
search_paths = get_path() search_paths = get_path()
env = dict(os.environ) env = dict(os.environ)
env["PATH"] = search_paths env["PATH"] = search_paths
if getattr(sys, "frozen", None) == "macosx_app": if "Zenmap.app" in sys.executable:
# These variables are set by py2app, but they can interfere with # These vars are set by the launcher, but they can interfere with
# Ndiff because Ndiff is also a Python application. Without # Ndiff because Ndiff is also a Python application. Without
# removing these, Ndiff will attempt to run using the # removing these, Ndiff will attempt to run using the
# py2app-bundled Python library, and may run into version or # bundled Python library, and may run into version or
# architecture mismatches. # architecture mismatches.
if "PYTHONPATH" in env: if "PYTHONPATH" in env:
del env["PYTHONPATH"] del env["PYTHONPATH"]