diff options
Diffstat (limited to 'match.c')
-rw-r--r-- | match.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: match.c,v 1.15 2001/12/05 16:54:51 markus Exp $"); | 38 | RCSID("$OpenBSD: match.c,v 1.16 2001/12/19 07:18:56 deraadt Exp $"); |
39 | 39 | ||
40 | #include "match.h" | 40 | #include "match.h" |
41 | #include "xmalloc.h" | 41 | #include "xmalloc.h" |
@@ -133,10 +133,10 @@ match_pattern_list(const char *string, const char *pattern, u_int len, | |||
133 | * subpattern to lowercase. | 133 | * subpattern to lowercase. |
134 | */ | 134 | */ |
135 | for (subi = 0; | 135 | for (subi = 0; |
136 | i < len && subi < sizeof(sub) - 1 && pattern[i] != ','; | 136 | i < len && subi < sizeof(sub) - 1 && pattern[i] != ','; |
137 | subi++, i++) | 137 | subi++, i++) |
138 | sub[subi] = dolower && isupper(pattern[i]) ? | 138 | sub[subi] = dolower && isupper(pattern[i]) ? |
139 | tolower(pattern[i]) : pattern[i]; | 139 | tolower(pattern[i]) : pattern[i]; |
140 | /* If subpattern too long, return failure (no match). */ | 140 | /* If subpattern too long, return failure (no match). */ |
141 | if (subi >= sizeof(sub) - 1) | 141 | if (subi >= sizeof(sub) - 1) |
142 | return 0; | 142 | return 0; |
@@ -239,7 +239,7 @@ match_list(const char *client, const char *server, u_int *next) | |||
239 | s = sp = xstrdup(server); | 239 | s = sp = xstrdup(server); |
240 | 240 | ||
241 | for ((p = strsep(&sp, SEP)), i=0; p && *p != '\0'; | 241 | for ((p = strsep(&sp, SEP)), i=0; p && *p != '\0'; |
242 | (p = strsep(&sp, SEP)), i++) { | 242 | (p = strsep(&sp, SEP)), i++) { |
243 | if (i < MAX_PROP) | 243 | if (i < MAX_PROP) |
244 | sproposals[i] = p; | 244 | sproposals[i] = p; |
245 | else | 245 | else |
@@ -248,7 +248,7 @@ match_list(const char *client, const char *server, u_int *next) | |||
248 | nproposals = i; | 248 | nproposals = i; |
249 | 249 | ||
250 | for ((p = strsep(&cp, SEP)), i=0; p && *p != '\0'; | 250 | for ((p = strsep(&cp, SEP)), i=0; p && *p != '\0'; |
251 | (p = strsep(&cp, SEP)), i++) { | 251 | (p = strsep(&cp, SEP)), i++) { |
252 | for (j = 0; j < nproposals; j++) { | 252 | for (j = 0; j < nproposals; j++) { |
253 | if (strcmp(p, sproposals[j]) == 0) { | 253 | if (strcmp(p, sproposals[j]) == 0) { |
254 | ret = xstrdup(p); | 254 | ret = xstrdup(p); |