52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
|
commit 32153fe41b9a3f461326348f16c9a71c6d980e89
|
||
|
|
Author: Pavel Zhukov <pzhukov@redhat.com>
|
||
|
|
Date: Thu Aug 3 13:18:01 2017 +0200
|
||
|
|
|
||
|
|
Use nmap-libssh2 and nmap-zlib headers for included only
|
||
|
|
|
||
|
|
Nmap specific libssh2/libz headers contain hardcoded version number thus
|
||
|
|
version information is incorrect if system version of library is chosen.
|
||
|
|
|
||
|
|
diff --git a/nmap.cc b/nmap.cc
|
||
|
|
index 512cb4a6e..79f7e77b5 100644
|
||
|
|
--- a/nmap.cc
|
||
|
|
+++ b/nmap.cc
|
||
|
|
@@ -182,11 +182,19 @@
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#if HAVE_LIBSSH2
|
||
|
|
+#ifdef LIBSSH2_INCLUDED
|
||
|
|
#include "libssh2/libssh2v.h"
|
||
|
|
+#else
|
||
|
|
+#include "libssh2.h"
|
||
|
|
+#endif
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#if HAVE_LIBZ
|
||
|
|
+#ifdef ZLIB_INCLUDED
|
||
|
|
#include "libz/libzv.h"
|
||
|
|
+#else
|
||
|
|
+#include "zlib.h"
|
||
|
|
+#endif
|
||
|
|
#endif
|
||
|
|
|
||
|
|
/* To get the version number only. */
|
||
|
|
@@ -2722,7 +2730,7 @@ static void display_nmap_version() {
|
||
|
|
#ifdef LIBSSH2_INCLUDED
|
||
|
|
with.push_back(std::string("nmap-libssh2-") + get_word_or_quote(LIBSSH2_VERSION_TEXT, 1));
|
||
|
|
#else
|
||
|
|
- with.push_back(std::string("libssh2-") + get_word_or_quote(LIBSSH2_VERSION_TEXT, 1));
|
||
|
|
+ with.push_back(std::string("libssh2-") + get_word_or_quote(LIBSSH2_VERSION, 0));
|
||
|
|
#endif
|
||
|
|
#else
|
||
|
|
without.push_back("libssh2");
|
||
|
|
@@ -2732,7 +2740,7 @@ static void display_nmap_version() {
|
||
|
|
#ifdef ZLIB_INCLUDED
|
||
|
|
with.push_back(std::string("nmap-libz-") + get_word_or_quote(LIBZ_VERSION_TEXT, 1));
|
||
|
|
#else
|
||
|
|
- with.push_back(std::string("libz-") + get_word_or_quote(LIBZ_VERSION_TEXT, 1));
|
||
|
|
+ with.push_back(std::string("libz-") + get_word_or_quote(ZLIB_VERSION, 0));
|
||
|
|
#endif
|
||
|
|
#else
|
||
|
|
without.push_back("libz");
|