Attachment #126349 for bug #44382




PKG_ARCH=`uname -p`
REV_DATESTAMP=`date '+%Y.%m.%d.%H.%M'`
REV_TIMESTAMP=`date '+%Y%m%d%H%M%S'`
first_ip=`/sbin/ifconfig | egrep "inet addr:" | sed -n '1p' | sed 's/ Bcast.*$//' | sed 's/^\s*inet addr://'`

AC_SUBST(PKG_ARCH)
AC_SUBST(REV_DATESTAMP)

	fi

elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \
	$PATH_TO_PING -n -s $first_ip 56 1 2>/dev/null | \
	egrep -i "^round-trip|^rtt" >/dev/null
then
        with_ping_command="$PATH_TO_PING -n -U -c %d %s"
	ac_cv_ping_packets_first=yes
	AC_MSG_RESULT([$with_ping_command])

elif $PATH_TO_PING -n -U -w 10 -c 1 $first_ip 2>/dev/null | \
	egrep -i "^round-trip|^rtt" >/dev/null
then
        with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s"

  ac_cv_ping_has_timeout=yes
	AC_MSG_RESULT([$with_ping_command])

elif $PATH_TO_PING -n -U -c 1 $first_ip 2>/dev/null | \
	egrep -i "^round-trip|^rtt" >/dev/null
then
        with_ping_command="$PATH_TO_PING -n -U -c %d %s"
	ac_cv_ping_packets_first=yes
	AC_MSG_RESULT([$with_ping_command])

elif $PATH_TO_PING -n -c 1 $first_ip 2>/dev/null | \
	egrep -i "^round-trip|^rtt" >/dev/null
then
	with_ping_command="$PATH_TO_PING -n -c %d %s"
	ac_cv_ping_packets_first=yes
	AC_MSG_RESULT([$with_ping_command])

elif $PATH_TO_PING -n $first_ip -c 1 2>/dev/null | \
	egrep -i "^round-trip|^rtt" >/dev/null
then
	with_ping_command="$PATH_TO_PING -n %s -c %d"
	AC_MSG_RESULT([$with_ping_command])

elif $PATH_TO_PING $first_ip -n 1 2>/dev/null | \
	egrep -i "^round-trip|^rtt" >/dev/null
then
	with_ping_command="$PATH_TO_PING %s -n %d"
	AC_MSG_RESULT([$with_ping_command])

elif $PATH_TO_PING -n -s $first_ip 56 1 2>/dev/null | \
	egrep -i "^round-trip|^rtt" >/dev/null
then
	with_ping_command="$PATH_TO_PING -n -s %s 56 %d"
	AC_MSG_RESULT([$with_ping_command])

elif $PATH_TO_PING -n -h $first_ip -s 56 -c 1 2>/dev/null | \
	egrep -i "^round-trip|^rtt" >/dev/null
then
	with_ping_command="$PATH_TO_PING -n -h %s -s 56 -c %d"
	AC_MSG_RESULT([$with_ping_command])

elif $PATH_TO_PING -n -s 56 -c 1 $first_ip 2>/dev/null | \
	egrep -i "^round-trip|^rtt" >/dev/null
then
	with_ping_command="$PATH_TO_PING -n -s 56 -c %d %s"
	ac_cv_ping_packets_first=yes
	AC_MSG_RESULT([$with_ping_command])

elif $PATH_TO_PING -n -c 1 $first_ip 2>/dev/null | \
	egrep -i "^round-trip|^rtt" >/dev/null
then
	with_ping_command="$PATH_TO_PING -n -c %d %s"

	if test -n "$PATH_TO_NSLOOKUP"
	then
		AC_MSG_CHECKING(for nslookup syntax)
		if $PATH_TO_NSLOOKUP -sil $first_ip 2>&1 | grep ["Invalid option: sil"] >/dev/null
		then
			ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
			AC_MSG_RESULT([$ac_cv_nslookup_command])

Lines 59-64 Link Here

(-)plugins/check_dig.c.orig (-2 / +8 lines)
59	char *record_type = "A";	59	char *record_type = "A";
60	char *expected_address = NULL;	60	char *expected_address = NULL;
61	char *dns_server = NULL;	61	char *dns_server = NULL;
		62	char server_name[256];
62	int verbose = FALSE;	63	int verbose = FALSE;
63	int server_port = DEFAULT_PORT;	64	int server_port = DEFAULT_PORT;
64	double warning_interval = UNDEFINED;	65	double warning_interval = UNDEFINED;
Lines 277-284 Link Here
277	dns_server = argv[c];	278	dns_server = argv[c];
278	}	279	}
279	else {	280	else {
280	dns_server = strdup ("127.0.0.1");	281	if(gethostname(server_name, 255) != 0) {
281	}	282	host_or_die("Can't get local hostname");
		283	}
		284	else {
		285	dns_server = strdup (server_name);
		286	}
		287	}
282	}	288	}
283		289
284	return validate_arguments ();	290	return validate_arguments ();

Return to bug 44382

Lines 93-98 Link Here

(-)configure.in.orig (-11 / +12 lines)
93	PKG_ARCH=`uname -p`	93	PKG_ARCH=`uname -p`
94	REV_DATESTAMP=`date '+%Y.%m.%d.%H.%M'`	94	REV_DATESTAMP=`date '+%Y.%m.%d.%H.%M'`
95	REV_TIMESTAMP=`date '+%Y%m%d%H%M%S'`	95	REV_TIMESTAMP=`date '+%Y%m%d%H%M%S'`
		96	first_ip=`/sbin/ifconfig \| egrep "inet addr:" \| sed -n '1p' \| sed 's/ Bcast.$//' \| sed 's/^\sinet addr://'`
96		97
97	AC_SUBST(PKG_ARCH)	98	AC_SUBST(PKG_ARCH)
98	AC_SUBST(REV_DATESTAMP)	99	AC_SUBST(REV_DATESTAMP)
Lines 771-784 Link Here
771	fi	772	fi
772		773
773	elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \	774	elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \
774	$PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null \| \	775	$PATH_TO_PING -n -s $first_ip 56 1 2>/dev/null \| \
775	egrep -i "^round-trip\|^rtt" >/dev/null	776	egrep -i "^round-trip\|^rtt" >/dev/null
776	then	777	then
777	with_ping_command="$PATH_TO_PING -n -U -c %d %s"	778	with_ping_command="$PATH_TO_PING -n -U -c %d %s"
778	ac_cv_ping_packets_first=yes	779	ac_cv_ping_packets_first=yes
779	AC_MSG_RESULT([$with_ping_command])	780	AC_MSG_RESULT([$with_ping_command])
780		781
781	elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null \| \	782	elif $PATH_TO_PING -n -U -w 10 -c 1 $first_ip 2>/dev/null \| \
782	egrep -i "^round-trip\|^rtt" >/dev/null	783	egrep -i "^round-trip\|^rtt" >/dev/null
783	then	784	then
784	with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s"	785	with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s"
Lines 786-837 Link Here
786	ac_cv_ping_has_timeout=yes	787	ac_cv_ping_has_timeout=yes
787	AC_MSG_RESULT([$with_ping_command])	788	AC_MSG_RESULT([$with_ping_command])
788		789
789	elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null \| \	790	elif $PATH_TO_PING -n -U -c 1 $first_ip 2>/dev/null \| \
790	egrep -i "^round-trip\|^rtt" >/dev/null	791	egrep -i "^round-trip\|^rtt" >/dev/null
791	then	792	then
792	with_ping_command="$PATH_TO_PING -n -U -c %d %s"	793	with_ping_command="$PATH_TO_PING -n -U -c %d %s"
793	ac_cv_ping_packets_first=yes	794	ac_cv_ping_packets_first=yes
794	AC_MSG_RESULT([$with_ping_command])	795	AC_MSG_RESULT([$with_ping_command])
795		796
796	elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null \| \	797	elif $PATH_TO_PING -n -c 1 $first_ip 2>/dev/null \| \
797	egrep -i "^round-trip\|^rtt" >/dev/null	798	egrep -i "^round-trip\|^rtt" >/dev/null
798	then	799	then
799	with_ping_command="$PATH_TO_PING -n -c %d %s"	800	with_ping_command="$PATH_TO_PING -n -c %d %s"
800	ac_cv_ping_packets_first=yes	801	ac_cv_ping_packets_first=yes
801	AC_MSG_RESULT([$with_ping_command])	802	AC_MSG_RESULT([$with_ping_command])
802		803
803	elif $PATH_TO_PING -n 127.0.0.1 -c 1 2>/dev/null \| \	804	elif $PATH_TO_PING -n $first_ip -c 1 2>/dev/null \| \
804	egrep -i "^round-trip\|^rtt" >/dev/null	805	egrep -i "^round-trip\|^rtt" >/dev/null
805	then	806	then
806	with_ping_command="$PATH_TO_PING -n %s -c %d"	807	with_ping_command="$PATH_TO_PING -n %s -c %d"
807	AC_MSG_RESULT([$with_ping_command])	808	AC_MSG_RESULT([$with_ping_command])
808		809
809	elif $PATH_TO_PING 127.0.0.1 -n 1 2>/dev/null \| \	810	elif $PATH_TO_PING $first_ip -n 1 2>/dev/null \| \
810	egrep -i "^round-trip\|^rtt" >/dev/null	811	egrep -i "^round-trip\|^rtt" >/dev/null
811	then	812	then
812	with_ping_command="$PATH_TO_PING %s -n %d"	813	with_ping_command="$PATH_TO_PING %s -n %d"
813	AC_MSG_RESULT([$with_ping_command])	814	AC_MSG_RESULT([$with_ping_command])
814		815
815	elif $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null \| \	816	elif $PATH_TO_PING -n -s $first_ip 56 1 2>/dev/null \| \
816	egrep -i "^round-trip\|^rtt" >/dev/null	817	egrep -i "^round-trip\|^rtt" >/dev/null
817	then	818	then
818	with_ping_command="$PATH_TO_PING -n -s %s 56 %d"	819	with_ping_command="$PATH_TO_PING -n -s %s 56 %d"
819	AC_MSG_RESULT([$with_ping_command])	820	AC_MSG_RESULT([$with_ping_command])
820		821
821	elif $PATH_TO_PING -n -h 127.0.0.1 -s 56 -c 1 2>/dev/null \| \	822	elif $PATH_TO_PING -n -h $first_ip -s 56 -c 1 2>/dev/null \| \
822	egrep -i "^round-trip\|^rtt" >/dev/null	823	egrep -i "^round-trip\|^rtt" >/dev/null
823	then	824	then
824	with_ping_command="$PATH_TO_PING -n -h %s -s 56 -c %d"	825	with_ping_command="$PATH_TO_PING -n -h %s -s 56 -c %d"
825	AC_MSG_RESULT([$with_ping_command])	826	AC_MSG_RESULT([$with_ping_command])
826		827
827	elif $PATH_TO_PING -n -s 56 -c 1 127.0.0.1 2>/dev/null \| \	828	elif $PATH_TO_PING -n -s 56 -c 1 $first_ip 2>/dev/null \| \
828	egrep -i "^round-trip\|^rtt" >/dev/null	829	egrep -i "^round-trip\|^rtt" >/dev/null
829	then	830	then
830	with_ping_command="$PATH_TO_PING -n -s 56 -c %d %s"	831	with_ping_command="$PATH_TO_PING -n -s 56 -c %d %s"
831	ac_cv_ping_packets_first=yes	832	ac_cv_ping_packets_first=yes
832	AC_MSG_RESULT([$with_ping_command])	833	AC_MSG_RESULT([$with_ping_command])
833		834
834	elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null \| \	835	elif $PATH_TO_PING -n -c 1 $first_ip 2>/dev/null \| \
835	egrep -i "^round-trip\|^rtt" >/dev/null	836	egrep -i "^round-trip\|^rtt" >/dev/null
836	then	837	then
837	with_ping_command="$PATH_TO_PING -n -c %d %s"	838	with_ping_command="$PATH_TO_PING -n -c %d %s"
Lines 1034-1040 Link Here
1034	if test -n "$PATH_TO_NSLOOKUP"	1035	if test -n "$PATH_TO_NSLOOKUP"
1035	then	1036	then
1036	AC_MSG_CHECKING(for nslookup syntax)	1037	AC_MSG_CHECKING(for nslookup syntax)
1037	if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 \| grep ["Invalid option: sil"] >/dev/null	1038	if $PATH_TO_NSLOOKUP -sil $first_ip 2>&1 \| grep ["Invalid option: sil"] >/dev/null
1038	then	1039	then
1039	ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"	1040	ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
1040	AC_MSG_RESULT([$ac_cv_nslookup_command])	1041	AC_MSG_RESULT([$ac_cv_nslookup_command])