From nobody@FreeBSD.org  Wed Oct 27 02:17:03 2004
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F15C716A4CE
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 27 Oct 2004 02:17:03 +0000 (GMT)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E3C7C43D58
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 27 Oct 2004 02:17:03 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.12.11/8.12.11) with ESMTP id i9R2H3QN025106
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 27 Oct 2004 02:17:03 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.11/8.12.11/Submit) id i9R2H3BN025105;
	Wed, 27 Oct 2004 02:17:03 GMT
	(envelope-from nobody)
Message-Id: <200410270217.i9R2H3BN025105@www.freebsd.org>
Date: Wed, 27 Oct 2004 02:17:03 GMT
From: Darrin Smith <sdar@salseast.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: nfs_diskless.c lacking include of #if options
X-Send-Pr-Version: www-2.3

>Number:         73183
>Category:       kern
>Synopsis:       [patch] nfs_diskless.c lacking include of #if options
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    brian
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 27 02:20:20 GMT 2004
>Closed-Date:    Mon Jan 24 13:51:07 GMT 2005
>Last-Modified:  Mon Jan 24 13:51:07 GMT 2005
>Originator:     Darrin Smith
>Release:        5.3-BETA6
>Organization:
Salisbury East High School
>Environment:
FreeBSD big-brother.sehs.sec 5.3-BETA6 FreeBSD 5.3-BETA6 #3: Wed Oct  6 15:53:24 CST 2004     sdar@big-brother.sehs.sec:/src/obj/src/src5/sys/SEHS  i386

>Description:
sys/nfsclient/nfs_diskless.c contains and #if !defined(BOOTP_NFSROOT) near the bottom of the file which is ALWAYS included since "opt_bootp.h" is not included in the file.
>How-To-Repeat:
insert an #error inside #ifdef, define BOOTP_NFSROOT in kernel config, compile and error will trigger
>Fix:
Apply patch:

Index: nfs_diskless.c
===================================================================
RCS file: /home/ncvs/src/sys/nfsclient/nfs_diskless.c,v
retrieving revision 1.8
diff -u -r1.8 nfs_diskless.c
--- nfs_diskless.c      28 Jul 2004 21:54:57 -0000      1.8
+++ nfs_diskless.c      27 Oct 2004 01:33:25 -0000
@@ -35,6 +35,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/nfsclient/nfs_diskless.c,v 1.8 2004/07/28 21:54:57 phk Exp $");

+#include "opt_bootp.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->brian 
Responsible-Changed-By: brian 
Responsible-Changed-When: Wed Jan 12 12:30:57 GMT 2005 
Responsible-Changed-Why:  
I'll commit this 

http://www.freebsd.org/cgi/query-pr.cgi?pr=73183 
State-Changed-From-To: open->patched 
State-Changed-By: brian 
State-Changed-When: Wed Jan 12 12:43:07 GMT 2005 
State-Changed-Why:  
Committed to -current.  I'll MFC in 7 days given no problems. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=73183 
State-Changed-From-To: patched->closed 
State-Changed-By: brian 
State-Changed-When: Mon Jan 24 13:50:47 GMT 2005 
State-Changed-Why:  
This has been committed to RELENG_5 

http://www.freebsd.org/cgi/query-pr.cgi?pr=73183 
>Unformatted:
