From owner-cvs-all Tue Mar 19 7:39:46 2002 Delivered-To: cvs-all@freebsd.org Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31]) by hub.freebsd.org (Postfix) with ESMTP id 97C1137B417; Tue, 19 Mar 2002 07:39:34 -0800 (PST) Received: by flood.ping.uio.no (Postfix, from userid 2602) id 998B45347; Tue, 19 Mar 2002 16:39:32 +0100 (CET) X-URL: http://www.ofug.org/~des/ X-Disclaimer: The views expressed in this message do not necessarily coincide with those of any organisation or company with which I am or have been affiliated. To: Peter Pentchev 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 ... References: <200203181009.g2IA9jI22591@freefall.freebsd.org> <20020319115435.J9136@straylight.oblivion.bg> From: Dag-Erling Smorgrav Date: 19 Mar 2002 16:39:31 +0100 In-Reply-To: <20020319115435.J9136@straylight.oblivion.bg> Message-ID: Lines: 14 User-Agent: Gnus/5.0808 (Gnus v5.8.8) Emacs/21.1 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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 --=-=-= Peter Pentchev writes: > 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 :( See attached patch. DES -- Dag-Erling Smorgrav - des@ofug.org --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=krb4or5.diff Index: servconf.c =================================================================== RCS file: /home/ncvs/src/crypto/openssh/servconf.c,v retrieving revision 1.23 diff -u -r1.23 servconf.c --- servconf.c 18 Mar 2002 10:09:42 -0000 1.23 +++ servconf.c 19 Mar 2002 15:26:16 -0000 @@ -13,9 +13,12 @@ RCSID("$OpenBSD: servconf.c,v 1.101 2002/02/04 12:15:25 markus Exp $"); RCSID("$FreeBSD: src/crypto/openssh/servconf.c,v 1.23 2002/03/18 10:09:42 des Exp $"); -#if defined(KRB4) || defined(KRB5) +#if defined(KRB4) #include #endif +#if defined(KRB5) +#include +#endif #ifdef AFS #include #endif @@ -178,9 +181,20 @@ options->rsa_authentication = 1; if (options->pubkey_authentication == -1) options->pubkey_authentication = 1; -#if defined(KRB4) || defined(KRB5) +#if defined(KRB4) && defined(KRB5) + if (options->kerberos_authentication == -1) + options->kerberos_authentication = + (access(KEYFILE, R_OK) == 0 || + (access(krb5_defkeyname, R_OK) == 0); +#elif defined(KRB4) if (options->kerberos_authentication == -1) options->kerberos_authentication = (access(KEYFILE, R_OK) == 0); +#elif defined(KRB5) + if (options->kerberos_authentication == -1) + options->kerberos_authentication = + (access(krb5_defkeyname, R_OK) == 0); +#endif +#if defined(KRB4) || defined(KRB5) if (options->kerberos_or_local_passwd == -1) options->kerberos_or_local_passwd = 1; if (options->kerberos_ticket_cleanup == -1) --=-=-=-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message