From owner-svn-src-stable@FreeBSD.ORG  Sun Feb  1 20:18:28 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3A1D41065679;
	Sun,  1 Feb 2009 20:18:28 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 26C848FC21;
	Sun,  1 Feb 2009 20:18:28 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n11KISrh065486;
	Sun, 1 Feb 2009 20:18:28 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n11KIS7T065485;
	Sun, 1 Feb 2009 20:18:28 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200902012018.n11KIS7T065485@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sun, 1 Feb 2009 20:18:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187988 - in stable/6/sys: . contrib/pf dev/cxgb netinet
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Feb 2009 20:18:28 -0000

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;