kern/68311: it is impossible to override defaults with kernel specific configuration files

[Rene de Vries]

>Number:         68311
>Category:       kern
>Synopsis:       it is impossible to override defaults with kernel specific configuration files
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 25 10:00:46 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Rene de Vries
>Release:        FreeBSD 4.8 i386
>Organization:
Tunix Internet Security & Training
>Environment:
System: FreeBSD upsilix.tunix.nl 4.8 FreeBSD 4.8-RELEASE-p22 #7: Wed Mar 3 15:00:31 CET 2004 rene at upsilix.tunix.nl:/usr/obj/usr/src/sys/UPSILIX i386

>Description:
When for a specific kernel configuration a driver needs to be
replaced this is impossible with the default 4.x config.
Only additions can be made. After this fix also replacements
work.

>How-To-Repeat:
>Fix:
Index: usr.sbin/config/mkmakefile.c
===================================================================
RCS file: usr.sbin/config/mkmakefile.c,v
retrieving revision 1.1.1.3
retrieving revision 1.2
diff -u -r1.1.1.3 -r1.2
--- usr.sbin/config/mkmakefile.c	2002/08/28 09:00:08	1.1.1.3
+++ usr.sbin/config/mkmakefile.c	2002/11/27 09:16:34	1.2
@@ -301,7 +301,7 @@
 	else
 		isdup = 0;
 	tp = 0;
-	if (first == 3 && pf == 0 && (tp = fltail_lookup(this)) != 0) {
+	if (first == 3 && pf != 0 && (tp = fltail_lookup(this)) != 0) {
 		if (tp->f_type != INVISIBLE || tp->f_flags)
 			printf("%s: Local file %s overrides %s.\n",
 			    fname, this, tp->f_fn);
>Release-Note:
>Audit-Trail:
>Unformatted: