[PATCH] Fix typos, OpenBSD + Portable

James Morrison ja2morri at csclub.uwaterloo.ca
Thu Jun 12 00:32:09 EST 2003


   X-Original-To: openssh-unix-dev at mindrot.org
   Date: Wed, 11 Jun 2003 22:43:02 +1000
   From: Darren Tucker <dtucker at zip.com.au>
   X-Accept-Language: en
   X-Spam-Level: 
   Sender: openssh-unix-dev-bounces+ja2morri=student.math.uwaterloo.ca at mindrot.org
   X-Spam-Status: No, hits=-5.0 required=5.0 tests=UNIFIED_PATCH version=2.20
   X-Spam-Level: 

   This is a multi-part message in MIME format.
   --------------7048D42E24A7A30A318B9676
   Content-Type: text/plain; charset=us-ascii
   Content-Transfer-Encoding: 7bit

   Hi.
	   Whenever I notice a typo someplace, I fix it in a local "typo tree". 
   Attached is 2 patches from that tree, one against OpenBSD and the other
   against Portable.

	   Is it worth fixing these?

		   -Daz.

   -- 
   Darren Tucker (dtucker at zip.com.au)

 Are you sure able chaning iff to if?  I would think any changes of those 
comments would require some explaination.

   Index: openbsd-compat/bsd-cray.c
   ===================================================================
   RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/openbsd-compat/bsd-cray.c,v
   retrieving revision 1.12
   diff -u -r1.12 bsd-cray.c
   --- openbsd-compat/bsd-cray.c	3 Jun 2003 02:45:27 -0000	1.12
   +++ openbsd-compat/bsd-cray.c	11 Jun 2003 05:14:44 -0000
   @@ -459,7 +459,7 @@
	   ia_success(&ssent, &sret);

	   /*
   -	 * Query for account, iff > 1 valid acid & askacid permbit
   +	 * Query for account, if > 1 valid acid & askacid permbit
	    */
	   if (((ue.ue_permbits & PERMBITS_ACCTID) ||
	       (ue.ue_acids[0] >= 0) && (ue.ue_acids[1] >= 0)) &&

 I don't really understand the comment to understand whether if and only if
makes sense or not.

   Index: auth.c
   ===================================================================
   RCS file: /cvs/src/usr.bin/ssh/auth.c,v
   retrieving revision 1.48
   diff -u -r1.48 auth.c
   --- auth.c	2003/06/02 09:17:34	1.48
   +++ auth.c	2003/06/11 12:29:19
   @@ -111,7 +111,7 @@
			   if (match_user(pw->pw_name, hostname, ipaddr,
			       options.allow_users[i]))
				   break;
   -		/* i < options.num_allow_users iff we break for loop */
   +		/* i < options.num_allow_users if we break for loop */
		   if (i >= options.num_allow_users) {
			   logit("User %.100s not allowed because not listed in AllowUsers",
			       pw->pw_name);

 Is the loop broken for any other reason than i < options.num_allow_users?

   Index: sftp-client.c
   ===================================================================
   RCS file: /cvs/src/usr.bin/ssh/sftp-client.c,v
   retrieving revision 1.43
   diff -u -r1.43 sftp-client.c
   --- sftp-client.c	2003/04/08 20:21:29	1.43
   +++ sftp-client.c	2003/06/11 12:29:21
   @@ -904,7 +904,7 @@
				   if (len < buflen)
					   buflen = MAX(MIN_READ_SIZE, len);
			   }
   -			if (max_req > 0) { /* max_req = 0 iff EOF received */
   +			if (max_req > 0) { /* max_req = 0 if EOF received */

 Are you sure you want to be chaning iff to if.  Iff means that this is
the only reason this could happen.

Jim




More information about the openssh-unix-dev mailing list