i386/79025: && in /usr/src/etc/Makefile needs to be an or

[Roland van Laar]

>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 at 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: