From owner-freebsd-bugs  Wed Apr  5 19:30: 6 2000
Delivered-To: freebsd-bugs@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 7DB5037B8F4
	for <freebsd-bugs@FreeBSD.org>; Wed,  5 Apr 2000 19:30:03 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id TAA03361;
	Wed, 5 Apr 2000 19:30:02 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from mail.uni-bielefeld.de (mail.uni-bielefeld.de [129.70.4.90])
	by hub.freebsd.org (Postfix) with ESMTP id 44AFB37B8BF
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  5 Apr 2000 19:26:07 -0700 (PDT)
	(envelope-from bfischer@Techfak.uni-bielefeld.de)
Received: from frolic.no-support.loc (ppp36-218.hrz.uni-bielefeld.de)
 by mail.uni-bielefeld.de
 (Sun Internet Mail Server sims.3.5.1999.05.24.18.28.p7)
 with ESMTP id <0FSK008AFPDL5I@mail.uni-bielefeld.de> for
 FreeBSD-gnats-submit@freebsd.org; Thu,  6 Apr 2000 04:25:58 +0200 (MET DST)
Received: (from bjoern@localhost) by frolic.no-support.loc (8.9.3/8.9.3)
 id EAA03408; Thu, 06 Apr 2000 04:21:46 +0200 (CEST envelope-from bjoern)
Message-Id: <200004060221.EAA03408@frolic.no-support.loc>
Date: Thu, 06 Apr 2000 04:21:46 +0200 (CEST)
From: Bjoern Fischer <bfischer@Techfak.Uni-Bielefeld.DE>
Reply-To: bfischer@Techfak.Uni-Bielefeld.DE
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: bin/17818: ssh X11 forward breaks with X11 not in /usr
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         17818
>Category:       bin
>Synopsis:       ssh X11 forward breaks with X11 not in /usr
>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:   Wed Apr  5 19:30:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Bjoern Fischer
>Release:        FreeBSD 4.0-STABLE i386
>Organization:
No-Support
>Environment:

The problem occurs on FreeBSD 4.0-STABLE i386 with USA_RESIDENT set to NO,
that is with international crypto.

>Description:

xauth is needed for the automatic X11 protocol forwarder within SSH. The
xauth path is hard compiled into SHH as `/usr/X11R6/bin/xauth' which will
break the X11 protocol forwarder when X11 is installed somewhere else.

FreeBSD's Makefiles for SSH do not make use of the variable X11BASE which
may be set in /etc/make.conf.

>How-To-Repeat:

See description.

>Fix:

The fix is obvious. See this patch (please review,
it is not `make world' tested!):

------------------------------------------------------------>8--------------
--- ./crypto/openssh/includes.h	2000/04/06 01:59:05	1.1
+++ ./crypto/openssh/includes.h	2000/04/06 01:59:32
@@ -58,7 +58,9 @@
 #include "version.h"
 
 /* Define this to be the path of the xauth program. */
+#ifndef XAUTH_PATH
 #define XAUTH_PATH "/usr/X11R6/bin/xauth"
+#endif
 
 /*
  * Define this to use pipes instead of socketpairs for communicating with the
--- ./secure/usr.bin/ssh/Makefile	2000/04/06 02:00:00	1.1
+++ ./secure/usr.bin/ssh/Makefile	2000/04/06 02:02:50
@@ -35,5 +35,9 @@
 
 .include <bsd.prog.mk>
 
+.if defined(X11BASE)
+CFLAGS+= -DXAUTH_PATH=${X11BASE}/bin/xauth
+.endif
+
 LDADD+=	-L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lutil -lz
 DPADD+=	${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
--- ./secure/usr.sbin/sshd/Makefile	2000/04/06 02:03:11	1.1
+++ ./secure/usr.sbin/sshd/Makefile	2000/04/06 02:03:25
@@ -39,5 +39,9 @@
 
 .include <bsd.prog.mk>
 
+.if defined(X11BASE)
+CFLAGS+= -DXAUTH_PATH=${X11BASE}/bin/xauth
+.endif
+
 LDADD+=	-L${.OBJDIR}/../../lib/libssh -lssh -lcrypt -lcrypto -lutil -lz -lwrap
 DPADD+=	${LIBCRYPT} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBWRAP}


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


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message