misc/95617: /usr/src/etc/Makefile contains logical error

[Sebastian Werner]

>Number:         95617
>Category:       misc
>Synopsis:       /usr/src/etc/Makefile contains logical error
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 11 09:40:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Sebastian Werner
>Release:        6.0
>Organization:
>Environment:
FreeBSD blackwing.hawo.stw.uni-erlangen.de 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Thu Nov 3 09:36:13 UTC 2005 root at blackwing.hawo.stw.uni-erlangen.de:/usr/obj/usr/src/sys/BLACKSTATION    i386
>Description:
During make distribution I got an error 64 while trying to install ssh in /usr/src/etc .

I got NO_CRYPT set (jail install stuff), but NOT NO_OPENSSL and NO_OPENSSH.

The error is happening, because the Makefile defines, that SSH= is not set, because NO_CRYPT  is set.  (line 27 of /usr/local/etc/Makefile)

But later in line 115, the variable SSH is used, because neither NO_OPENSSL nor NO_OPENSSH is set. In this case there is no check for NO_CRYPT.
>How-To-Repeat:
Set NO_CRYPT but do not set NO_OPENSSH

make distribution
>Fix:
--- /usr/local/etc/Makefile       Tue Apr 11 01:52:10 2006
+++ usr/local/etc/Makefilee    Tue Apr 11 01:54:28 2006
@@ -111,6 +111,7 @@
 .if !defined(NO_SENDMAIL)
        cd ${.CURDIR}/sendmail; ${MAKE} distribution
 .endif
+.if !defined(NO_CRYPT)
 .if !defined(NO_OPENSSL)
 .if !defined(NO_OPENSSH)
        cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
@@ -118,6 +119,7 @@
 .endif
        cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
            ${SSL} ${DESTDIR}/etc/ssl
+.endif
 .endif
 .if !defined(NO_KERBEROS)
        cd ${.CURDIR}/root; \





>Release-Note:
>Audit-Trail:
>Unformatted: