From owner-freebsd-i386@FreeBSD.ORG  Sat Mar 19 19:50:02 2005
Return-Path: <owner-freebsd-i386@FreeBSD.ORG>
Delivered-To: freebsd-i386@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8D1A716A4CE
	for <freebsd-i386@hub.freebsd.org>;
	Sat, 19 Mar 2005 19:50:02 +0000 (GMT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4CF7043D54
	for <freebsd-i386@hub.freebsd.org>;
	Sat, 19 Mar 2005 19:50:02 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j2JJo2V0025021
	for <freebsd-i386@freefall.freebsd.org>; Sat, 19 Mar 2005 19:50:02 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j2JJo2VA025020;
	Sat, 19 Mar 2005 19:50:02 GMT
	(envelope-from gnats)
Resent-Date: Sat, 19 Mar 2005 19:50:02 GMT
Resent-Message-Id: <200503191950.j2JJo2VA025020@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-i386@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
	Roland van Laar <roland@wirelessleiden.nl>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 74E4716A4CE
	for <freebsd-gnats-submit@FreeBSD.org>;
	Sat, 19 Mar 2005 19:43:41 +0000 (GMT)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5CDE743D1F
	for <freebsd-gnats-submit@FreeBSD.org>;
	Sat, 19 Mar 2005 19:43:41 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id j2JJhegw043922
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 19 Mar 2005 19:43:40 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id j2JJhemN043920;
	Sat, 19 Mar 2005 19:43:40 GMT
	(envelope-from nobody)
Message-Id: <200503191943.j2JJhemN043920@www.freebsd.org>
Date: Sat, 19 Mar 2005 19:43:40 GMT
From: Roland van Laar <roland@wirelessleiden.nl>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-2.3
Subject: i386/79025: && in /usr/src/etc/Makefile needs to be an or
X-BeenThere: freebsd-i386@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: I386-specific issues for FreeBSD <freebsd-i386.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-i386>,
	<mailto:freebsd-i386-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-i386>
List-Post: <mailto:freebsd-i386@freebsd.org>
List-Help: <mailto:freebsd-i386-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-i386>,
	<mailto:freebsd-i386-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Mar 2005 19:50:02 -0000


>Number:         79025
>Category:       i386
>Synopsis:       && in /usr/src/etc/Makefile needs to be an or
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-i386
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 19 19:50:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Roland van Laar
>Release:        FreeBSD 5.3
>Organization:
>Environment:
FreeBSD hawking.dorm.ucu.uu.nl 5.3-RELEASE-p5 FreeBSD 5.3-RELEASE-p5 #1: Fri Feb 25 23:29:59 CET 2005     root@hawking.dorm.ucu.uu.nl:/usr/obj/usr/src/sys/hawking-060205  i386

>Description:
make distribution fails when -DNOCRYPT is defined because there is no second check if NOCRYPT is defined
      
>How-To-Repeat:
make -DNO_CRYPT world
cd etc/ 
make -DNO_CRYPT distribution

>Fix:
-.if !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
.if !defined(NO_OPENSSH)
>Release-Note:
>Audit-Trail:
>Unformatted: