===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/match.c,v
retrieving revision 1.14.2.1
retrieving revision 1.15
diff -u -r1.14.2.1 -r1.15
--- src/usr.bin/ssh/match.c	2002/03/07 17:37:46	1.14.2.1
+++ src/usr.bin/ssh/match.c	2001/12/05 16:54:51	1.15
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: match.c,v 1.14.2.1 2002/03/07 17:37:46 jason Exp $");
+RCSID("$OpenBSD: match.c,v 1.15 2001/12/05 16:54:51 markus Exp $");
 
 #include "match.h"
 #include "xmalloc.h"
@@ -133,10 +133,10 @@
 		 * subpattern to lowercase.
 		 */
 		for (subi = 0;
-		    i < len && subi < sizeof(sub) - 1 && pattern[i] != ',';
-		    subi++, i++)
+		     i < len && subi < sizeof(sub) - 1 && pattern[i] != ',';
+		     subi++, i++)
 			sub[subi] = dolower && isupper(pattern[i]) ?
-			    tolower(pattern[i]) : pattern[i];
+			     tolower(pattern[i]) : pattern[i];
 		/* If subpattern too long, return failure (no match). */
 		if (subi >= sizeof(sub) - 1)
 			return 0;
@@ -226,7 +226,7 @@
  * Returns first item from client-list that is also supported by server-list,
  * caller must xfree() returned string.
  */
-#define	MAX_PROP	40
+#define	MAX_PROP	20
 #define	SEP	","
 char *
 match_list(const char *client, const char *server, u_int *next)
@@ -239,7 +239,7 @@
 	s = sp = xstrdup(server);
 
 	for ((p = strsep(&sp, SEP)), i=0; p && *p != '\0';
-	    (p = strsep(&sp, SEP)), i++) {
+	     (p = strsep(&sp, SEP)), i++) {
 		if (i < MAX_PROP)
 			sproposals[i] = p;
 		else
@@ -248,7 +248,7 @@
 	nproposals = i;
 
 	for ((p = strsep(&cp, SEP)), i=0; p && *p != '\0';
-	    (p = strsep(&cp, SEP)), i++) {
+	     (p = strsep(&cp, SEP)), i++) {
 		for (j = 0; j < nproposals; j++) {
 			if (strcmp(p, sproposals[j]) == 0) {
 				ret = xstrdup(p);