svn commit: r233136 - in head/secure: usr.bin/ssh usr.sbin/sshd

Eitan Adler eadler at
Mon Mar 19 23:12:57 UTC 2012

2012/3/19 Dag-Erling Smørgrav <des at>:
> John Baldwin <jhb at> writes:

Looking at the original contents of the two files

-.if defined(X11BASE) || defined(LOCALBASE)

-.if defined(X11BASE)

which I think was the cause of my original confusion. The change *was*
a no-op for ssh but resulted in behavior change when LOCALBASE was
defined in sshd.

What do you think of the following patch which uses the same .defined
version as the original restores LOCALBASE support in sshd and and
adds support to ssh? Is there a reason for the difference between the
two? [ build tested only ]

commit 3b4f7b77abc6a0fadb3a15ebd7e8e8d475047842
Author: Eitan Adler <lists at>
Date:   Mon Mar 19 19:07:35 2012 -0400

    Restore the ability to use a non-standard LOCALBASE to sshd
    Add the ability to use a non-standard LOCALBASE to ssh

    Submitted by:	jhb
    Reviewed by:	des
    Approved by:	cperciva
    MFC after:	0 days (with r233136)

diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 619c44a..9304fd55 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -28,6 +28,10 @@ LDADD+=	 -lgssapi
 LDADD+=	-lcrypt -lcrypto

+.if defined(LOCALBASE)
 .include <>

diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index 0120771..cc914c4 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -43,6 +43,10 @@ LDADD+=	 -lgssapi_krb5 -lgssapi -lkrb5 -lasn1
 LDADD+=	-lcrypto -lcrypt

+.if defined(LOCALBASE)
 .include <>


Eitan Adler
Source & Ports committer
X11, Bugbusting teams

More information about the svn-src-all mailing list