1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 04:31:29 +00:00

Detect SNMP MIB2 STREAMS on Solaris even if /dev/ip is not present.

This commit is contained in:
dmiller
2017-02-13 19:46:23 +00:00
parent b757aa1750
commit 2f104650a8
3 changed files with 2059 additions and 4807 deletions

View File

@@ -2335,3 +2335,27 @@ index 315e7b0..6180d85 100644
s[0], s[1], s[2], s[3], s[4], s[5], s[6], s[7], s[0], s[1], s[2], s[3], s[4], s[5], s[6], s[7],
&idx, &bits, &scope, &flags, name); &idx, &bits, &scope, &flags, name);
if (strcmp(name, entry->intf_name) == 0) { if (strcmp(name, entry->intf_name) == 0) {
o Detect SNMP MIB2 STREAMS on Solaris even if /dev/ip is not present, as it is
not in some Zones configurations. Using /dev/arp is proper in this case.
diff --git a/libdnet-stripped/config/acinclude.m4 b/libdnet-stripped/config/acinclude.m4
index 622c6a2..3145975 100644
--- a/libdnet-stripped/config/acinclude.m4
+++ b/libdnet-stripped/config/acinclude.m4
@@ -161,12 +161,12 @@ dnl results: HAVE_STREAMS_MIB2
dnl
AC_DEFUN(AC_DNET_STREAMS_MIB2,
[AC_MSG_CHECKING(for SNMP MIB2 STREAMS)
- AC_CACHE_VAL(ac_cv_dnet_streams_mib2,
- if test -f /usr/include/inet/mib2.h -a -c /dev/ip ; then
+ AC_CACHE_VAL(ac_cv_dnet_streams_mib2,[
+ if test -f /usr/include/inet/mib2.h -a '(' -c /dev/ip -o -c /dev/arp ')' ; then
ac_cv_dnet_streams_mib2=yes
else
ac_cv_dnet_streams_mib2=no
- fi)
+ fi])
AC_MSG_RESULT($ac_cv_dnet_streams_mib2)
if test $ac_cv_dnet_streams_mib2 = yes ; then
AC_DEFINE(HAVE_STREAMS_MIB2, 1,

View File

@@ -161,12 +161,12 @@ dnl results: HAVE_STREAMS_MIB2
dnl dnl
AC_DEFUN(AC_DNET_STREAMS_MIB2, AC_DEFUN(AC_DNET_STREAMS_MIB2,
[AC_MSG_CHECKING(for SNMP MIB2 STREAMS) [AC_MSG_CHECKING(for SNMP MIB2 STREAMS)
AC_CACHE_VAL(ac_cv_dnet_streams_mib2, AC_CACHE_VAL(ac_cv_dnet_streams_mib2,[
if test -f /usr/include/inet/mib2.h -a -c /dev/ip ; then if test -f /usr/include/inet/mib2.h -a '(' -c /dev/ip -o -c /dev/arp ')' ; then
ac_cv_dnet_streams_mib2=yes ac_cv_dnet_streams_mib2=yes
else else
ac_cv_dnet_streams_mib2=no ac_cv_dnet_streams_mib2=no
fi) fi])
AC_MSG_RESULT($ac_cv_dnet_streams_mib2) AC_MSG_RESULT($ac_cv_dnet_streams_mib2)
if test $ac_cv_dnet_streams_mib2 = yes ; then if test $ac_cv_dnet_streams_mib2 = yes ; then
AC_DEFINE(HAVE_STREAMS_MIB2, 1, AC_DEFINE(HAVE_STREAMS_MIB2, 1,

File diff suppressed because it is too large Load Diff