From owner-cvs-all Tue Mar 26 3:53:37 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 E96EB37B420 for ; Tue, 26 Mar 2002 03:53:13 -0800 (PST) Received: (qmail 44607 invoked by uid 1000); 26 Mar 2002 11:53:15 -0000 Date: Tue, 26 Mar 2002 13:53:15 +0200 From: Peter Pentchev To: Jacques Vidrine Cc: Dag-Erling Smorgrav , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/crypto/openssh servconf.c Message-ID: <20020326135314.B301@straylight.oblivion.bg> Mail-Followup-To: Jacques Vidrine , Dag-Erling Smorgrav , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org References: <200203251455.g2PEtfB08506@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-md5; protocol="application/pgp-signature"; boundary="DKU6Jbt7q3WqK7+M" Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <200203251455.g2PEtfB08506@freefall.freebsd.org>; from nectar@FreeBSD.org on Mon, Mar 25, 2002 at 06:55:41AM -0800 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 --DKU6Jbt7q3WqK7+M Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Mar 25, 2002 at 06:55:41AM -0800, Jacques Vidrine wrote: > nectar 2002/03/25 06:55:41 PST >=20 > Modified files: > crypto/openssh servconf.c=20 > Log: > Fix typo (missing paren) affecting KRB4 && KRB5 case. > =20 > Approved by: des [CC'd to des] It seems that you added the parenthesis to the wrong line - the one in the KRB5-only case :) Patch attached. 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 You have, of course, just begun reading the sentence that you have just fin= ished reading. Index: src/crypto/openssh/servconf.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/crypto/openssh/servconf.c,v retrieving revision 1.25 diff -u -r1.25 servconf.c --- src/crypto/openssh/servconf.c 25 Mar 2002 14:55:41 -0000 1.25 +++ src/crypto/openssh/servconf.c 26 Mar 2002 11:28:46 -0000 @@ -185,14 +185,14 @@ if (options->kerberos_authentication =3D=3D -1) options->kerberos_authentication =3D (access(KEYFILE, R_OK) =3D=3D 0 || - (access(krb5_defkeyname, R_OK) =3D=3D 0); + (access(krb5_defkeyname, R_OK) =3D=3D 0)); #elif defined(KRB4) if (options->kerberos_authentication =3D=3D -1) options->kerberos_authentication =3D (access(KEYFILE, R_OK) =3D=3D 0); #elif defined(KRB5) if (options->kerberos_authentication =3D=3D -1) options->kerberos_authentication =3D - (access(krb5_defkeyname, R_OK) =3D=3D 0)); + (access(krb5_defkeyname, R_OK) =3D=3D 0); #endif #if defined(KRB4) || defined(KRB5) if (options->kerberos_or_local_passwd =3D=3D -1) --DKU6Jbt7q3WqK7+M 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 iEYEARECAAYFAjygYSoACgkQ7Ri2jRYZRVO2vgCeN7YNVsbPiyl4ls75CPFjCBY4 wgIAn3Tr15wyEpIYNbZLqNVZWgr+lQQn =RgLc -----END PGP SIGNATURE----- --DKU6Jbt7q3WqK7+M-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message