Author: rwatson
Date: Sun Feb 1 20:18:27 2009
New Revision: 187988
URL: http://svn.freebsd.org/changeset/base/187988
Log:
Merge r187987 from stable/7 to stable/6:
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/6/sys/ (props changed)
stable/6/sys/contrib/pf/ (props changed)
stable/6/sys/dev/cxgb/ (props changed)
stable/6/sys/netinet/ip_output.c
Modified: stable/6/sys/netinet/ip_output.c
==============================================================================
--- stable/6/sys/netinet/ip_output.c Sun Feb 1 19:20:45 2009
(r187987)
+++ stable/6/sys/netinet/ip_output.c Sun Feb 1 20:18:27 2009
(r187988)
@@ -1255,7 +1255,7 @@ ip_ctloutput_pcbinfo(so, sopt, pcbinfo)
break;
case IP_MINTTL:
- if (optval > 0 && optval <= MAXTTL)
+ if (optval >= 0 && optval <= MAXTTL)
inp->inp_ip_minttl = optval;
else
error = EINVAL;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
