From 7f12aaafe6865c700aec3cea1f7288ea5c6b5948 Mon Sep 17 00:00:00 2001 From: fyodor Date: Fri, 16 Mar 2007 09:58:25 +0000 Subject: [PATCH] mac os x portability fix from christophe thil --- CHANGELOG | 4 ++++ docs/nmap.1 | 3 ++- docs/nmap.usage.txt | 2 +- traceroute.h | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index a30ad95bb..9e00bc96c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,8 @@ # Nmap Changelog ($Id$); -*-text-*- +o Fix a portability problem related to the new traceroute + functionality so that it compiles on Mac OS X. Thanks to Christophe + Thil for reporting the problem and sending the 1-line fix. + 4.21ALPHA3 o Just fixed a packaging problem with the 4.21ALPHA2 release (thanks diff --git a/docs/nmap.1 b/docs/nmap.1 index cbf2a6570..9d2890a9d 100644 --- a/docs/nmap.1 +++ b/docs/nmap.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "NMAP" "1" "03/15/2007" "" "Nmap Reference Guide" +.TH "NMAP" "1" "03/16/2007" "" "Nmap Reference Guide" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -117,6 +117,7 @@ SCAN TECHNIQUES: \-sI : Idlescan \-sO: IP protocol scan \-b : FTP bounce scan + \-\-traceroute: Trace hop path to each host PORT SPECIFICATION AND SCAN ORDER: \-p : Only scan specified ports Ex: \-p22; \-p1\-65535; \-p U:53,111,137,T:21\-25,80,139,8080 diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt index 1e370563c..13ca564c7 100644 --- a/docs/nmap.usage.txt +++ b/docs/nmap.usage.txt @@ -1,4 +1,4 @@ -Nmap 4.21ALPHA2 ( http://insecure.org ) +Nmap 4.21ALPHA3 ( http://insecure.org ) Usage: nmap [Scan Type(s)] [Options] {target specification} TARGET SPECIFICATION: Can pass hostnames, IP addresses, networks, etc. diff --git a/traceroute.h b/traceroute.h index cc2ce4299..3bb5ce1c4 100644 --- a/traceroute.h +++ b/traceroute.h @@ -124,7 +124,7 @@ #define NAMEIPLEN MAXHOSTNAMELEN+INET6_ADDRSTRLEN -#ifdef WIN32 +#if defined(WIN32) || defined(MACOSX) #define ICMP_ECHOREPLY 0 #define ICMP_DEST_UNREACH 3 #define ICMP_ECHO 8