svn commit: r187987 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb netinet

[Robert Watson]

Author: rwatson
Date: Sun Feb  1 19:20:45 2009
New Revision: 187987
URL: http://svn.freebsd.org/changeset/base/187987

Log:
  Merge r186717 from head to stable/7:
  
     Allow the IP_MINTTL socket option to be set to 0 so that it can be
     disabled entirely, which is its default state before set to a
     non-zero value.
  
     PR:          128790
     Submitted by:        Nick Hilliard <nick at foobar dot org>

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/netinet/ip_output.c

Modified: stable/7/sys/netinet/ip_output.c
==============================================================================
--- stable/7/sys/netinet/ip_output.c	Sun Feb  1 18:10:06 2009	(r187986)
+++ stable/7/sys/netinet/ip_output.c	Sun Feb  1 19:20:45 2009	(r187987)
@@ -875,7 +875,7 @@ ip_ctloutput(struct socket *so, struct s
 				break;
 
 			case IP_MINTTL:
-				if (optval > 0 && optval <= MAXTTL)
+				if (optval >= 0 && optval <= MAXTTL)
 					inp->inp_ip_minttl = optval;
 				else
 					error = EINVAL;