From owner-cvs-all Mon Jun 26 14:28:43 2000 Delivered-To: cvs-all@freebsd.org Received: from relay.nuxi.com (nuxi.cs.ucdavis.edu [169.237.7.38]) by hub.freebsd.org (Postfix) with ESMTP id 2767D37B5E8; Mon, 26 Jun 2000 14:28:37 -0700 (PDT) (envelope-from obrien@NUXI.com) Received: from dragon.nuxi.com (root@trang.nuxi.com [209.152.133.57]) by relay.nuxi.com (8.9.3/8.9.3) with ESMTP id OAA20459; Mon, 26 Jun 2000 14:28:34 -0700 (PDT) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.9.3/8.9.1) id OAA02538; Mon, 26 Jun 2000 14:28:31 -0700 (PDT) (envelope-from obrien) Date: Mon, 26 Jun 2000 14:28:31 -0700 From: "David O'Brien" To: Brian Fundakowski Feldman Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/crypto/openssh canohost.c ssh.h sshd.c Message-ID: <20000626142831.B2392@dragon.nuxi.com> Reply-To: obrien@FreeBSD.org References: <20000626005726.B11096@dragon.nuxi.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2i In-Reply-To: ; from green@FreeBSD.org on Mon, Jun 26, 2000 at 05:13:36PM -0400 X-Operating-System: FreeBSD 5.0-CURRENT Organization: The NUXI BSD group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Mon, Jun 26, 2000 at 05:13:36PM -0400, Brian Fundakowski Feldman wrote: > No, they weren't. You compared 1.1 with 1.2, it seems. For that you are right, and I apologize. > God, I sure love CVS. You may be the only one here. ;-) > It belongs with the rest in src/crypto/openssh. It's referenced from there, > from sshd.c and defined in ssh.h, so what makes it not belong there? Why can't the function be in its own file, regardless where it is referenced from? At one time in CS classes they used to encourage one function per file. So it is not totally w/o merit. > As for maintenance headache, I am planning on getting this into the > OpenBSD OpenSSH very soon, and sshd.c/ssh.h/canohost.c will all have > less diffs than before. It doesn't matter. (1) any change to the vendor branch will cause a conflict on the next import. (2) by putting the function in the middle rather than say at the very end, you've increased the possibility that a merge will fail since both the bits both before and after your added function blow the merge if either are changed by the original author. Since I'm not the openssh src/crypto/ maintainer, I wont say anymore. -- -- David (obrien@FreeBSD.org) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message