From owner-cvs-all Tue Mar 19 2:41:26 2002 Delivered-To: cvs-all@freebsd.org Received: from straylight.ringlet.net (discworld.nanolink.com [217.75.135.248]) by hub.freebsd.org (Postfix) with SMTP id 9DBFE37B41C for ; Tue, 19 Mar 2002 02:41:12 -0800 (PST) Received: (qmail 81017 invoked by uid 1000); 19 Mar 2002 09:54:35 -0000 Date: Tue, 19 Mar 2002 11:54:35 +0200 From: Peter Pentchev To: Dag-Erling Smorgrav Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/crypto/openssh auth-chall.c auth-krb4.c auth-krb5.c auth-pam.c auth-passwd.c auth-rh-rsa.c auth-rsa.c auth.c auth.h auth1.c auth2.c authfd.c authfile.c bufaux.c canohost.c channels.c channels.h cipher.c cipher.h compat.c ... Message-ID: <20020319115435.J9136@straylight.oblivion.bg> Mail-Followup-To: Dag-Erling Smorgrav , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org References: <200203181009.g2IA9jI22591@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-md5; protocol="application/pgp-signature"; boundary="ibvzjYYg+QDzMCy1" Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: ; from des@ofug.org on Mon, Mar 18, 2002 at 11:33:25AM +0100 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --ibvzjYYg+QDzMCy1 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Mar 18, 2002 at 11:33:25AM +0100, Dag-Erling Smorgrav wrote: > Dag-Erling Smorgrav writes: > > Log: > > Fix conflicts. >=20 > This was a real bitch... expect stuff to break. I've verified that > it builds with krb4 and krb5 support, and that it works in !krb case, > but the diffs are so huge I'm bound to have done *something* wrong. Well, I really hate to be a bearer of bad news (lucky for me that I never got 'round to putting a place marker in the xearth file ;), but.. servconf.c has quite a lot of #if defined(KRB4) || defined(KRB5). Those break, like, badly, if KRB5 is defined *without* KRB4 :( This is not any of your doing, it is a bug in OpenSSH itself. It seems everyone there assumes that everyone else builds both Kerberos IV and Kerberos 5 at the same time; well, I don't :) And still.. good work, DES! G'luck, Peter --=20 Peter Pentchev roam@ringlet.net roam@FreeBSD.org PGP key: http://people.FreeBSD.org/~roam/roam.key.asc Key fingerprint FDBA FD79 C26F 3C51 C95E DF9E ED18 B68D 1619 4553 This sentence no verb. --ibvzjYYg+QDzMCy1 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (FreeBSD) Comment: For info see http://www.gnupg.org iEYEARECAAYFAjyXCtsACgkQ7Ri2jRYZRVPvYQCgmkUmyldVhVe1XOLbmEc75Zwl 9kgAn22pVIbDm8dqCqbM/WUEjM68WXBS =KBBT -----END PGP SIGNATURE----- --ibvzjYYg+QDzMCy1-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message