2 files changed, 9 insertions, 4 deletions

diff --git a/sbin/ping6/ping6.8 b/sbin/ping6/ping6.8
index 89a81684cf55..2830238a585f 100644
--- a/sbin/ping6/ping6.8
+++ b/sbin/ping6/ping6.8
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 17, 1998
+.Dd May 27, 2008
 .Dt PING6 8
 .Os
 .Sh NAME
@@ -407,7 +407,9 @@ option of
 The
 .Nm
 utility returns 0 on success (the host is alive),
-and non-zero if the arguments are incorrect or the host is not responding.
+2 if the transmission was successful but no responses were received,
+any other non-zero value if the arguments are incorrect or                                                            
+another error has occured.                                                                                            
 .Sh EXAMPLES
 Normally,
 .Nm
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index a7ab9a1f3e8a..14b30fc27cc2 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -1070,6 +1070,9 @@ main(argc, argv)
 
 		/* signal handling */
 		if (seenalrm) {
+			/* last packet sent, timeout reached? */
+			if (npackets && ntransmitted >= npackets)
+				break;
 			retransmit();
 			seenalrm = 0;
 			continue;
@@ -1168,7 +1171,7 @@ main(argc, argv)
 			break;
 	}
 	summary();
-	exit(nreceived == 0);
+	exit(nreceived == 0 ? 2 : 0);
 }
 
 void
@@ -1219,7 +1222,7 @@ retransmit()
 	itimer.it_interval.tv_usec = 0;
 	itimer.it_value.tv_usec = 0;
 
-	(void)signal(SIGALRM, onint);
+	(void)signal(SIGALRM, onsignal);
 	(void)setitimer(ITIMER_REAL, &itimer, NULL);
 }