From martti@research.zopps.fi Wed Apr 28 22:31:51 1999
Return-Path: <martti@research.zopps.fi>
Received: from server.research.zopps.fi (ws66.research.zopps.fi [195.165.196.66])
	by hub.freebsd.org (Postfix) with ESMTP id C912914F22
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 28 Apr 1999 22:31:47 -0700 (PDT)
	(envelope-from martti@research.zopps.fi)
Received: (from uucp@localhost)
	by server.research.zopps.fi (8.9.3/8.8.8) id IAA82770
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 29 Apr 1999 08:29:48 +0300 (EEST)
	(envelope-from martti.kuparinen)
Received: from ws125.research.zopps.fi(195.165.196.125)
 via SMTP by server.research.zopps.fi, id smtpdL82763; Thu Apr 29 08:29:39 1999
Received: (from martti@localhost)
	by ws125.research.zopps.fi (8.9.2/8.8.8) id IAA00829;
	Thu, 29 Apr 1999 08:29:39 +0300 (EEST)
	(envelope-from martti@smtp.research.zopps.fi)
Message-Id: <199904290529.IAA00829@ws125.research.zopps.fi>
Date: Thu, 29 Apr 1999 08:29:39 +0300 (EEST)
From: martti.kuparinen@ericsson.com
Sender: martti@research.zopps.fi
Reply-To: martti.kuparinen@ericsson.com
To: FreeBSD-gnats-submit@freebsd.org
Subject: [PATCH] /etc/rc.firewall ignores user settings
X-Send-Pr-Version: 3.2

>Number:         11377
>Category:       conf
>Synopsis:       /etc/rc.firewall ignores user settings defined in /etc/rc.conf
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 28 22:40:00 PDT 1999
>Closed-Date:    Sat May 1 03:09:02 PDT 1999
>Last-Modified:  Sat May  1 03:20:02 PDT 1999
>Originator:     Martti Kuparinen
>Release:        FreeBSD 3.1-STABLE i386
>Organization:
Oy L M Ericsson Ab
>Environment:

FreeBSD bastion 3.1-STABLE FreeBSD 3.1-STABLE #8: Wed Apr 28 07:36:23 EEST 1999     root@bastion:/usr/src/sys/compile/BASTION  i386

>Description:

The current version of /etc/rc.firewall ignores user's settings
defined in /etc/rc.conf as the first if-statement is always true.
I think this must be fixed before 3.2-RELEASE...

>How-To-Repeat:


>Fix:
	
Apply the following patch:

*** rc.firewall.orig	Thu Apr 29 08:21:05 1999
--- rc.firewall	Thu Apr 29 08:21:27 1999
***************
*** 5,11 ****
  # Suck in the configuration variables.
  if [ -f /etc/defaults/rc.conf ]; then
  	. /etc/defaults/rc.conf
! elif [ -f /etc/rc.conf ]; then
  	. /etc/rc.conf
  fi
  
--- 5,12 ----
  # Suck in the configuration variables.
  if [ -f /etc/defaults/rc.conf ]; then
  	. /etc/defaults/rc.conf
! fi
! if [ -f /etc/rc.conf ]; then
  	. /etc/rc.conf
  fi

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: des 
State-Changed-When: Sat May 1 03:09:02 PDT 1999 
State-Changed-Why:  
Incorrect PR. 

From: Dag-Erling Smorgrav <des@flood.ping.uio.no>
To: martti.kuparinen@ericsson.com
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: conf/11377: [PATCH] /etc/rc.firewall ignores user settings
Date: 01 May 1999 12:08:51 +0200

 martti.kuparinen@ericsson.com writes:
 > The current version of /etc/rc.firewall ignores user's settings
 > defined in /etc/rc.conf as the first if-statement is always true.
 > I think this must be fixed before 3.2-RELEASE...
 
 No. RTFS. /etc/defaults/rc.conf includes /etc/rc.conf and
 /etc/rc.conf.local if they exist..
 
 DES
 -- 
 Dag-Erling Smorgrav - des@flood.ping.uio.no
 
>Unformatted:
