diff options
author | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
commit | 9b71add4cecf753c45f5fbd6ff0913bc95b3e95d (patch) | |
tree | d4ea8fdb30c7949c6433f5277c39548ea579d4dc /match.c | |
parent | ed07bcbea56007ab5b218ddf3aa6a7d4e21966e0 (diff) | |
parent | 16704d57999d987fb8d9ba53379841a79f016d67 (diff) |
Merge 4.2p1 to the trunk.
Diffstat (limited to 'match.c')
-rw-r--r-- | match.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: match.c,v 1.19 2002/03/01 13:12:10 markus Exp $"); | 38 | RCSID("$OpenBSD: match.c,v 1.20 2005/06/17 02:44:32 djm Exp $"); |
39 | 39 | ||
40 | #include "match.h" | 40 | #include "match.h" |
41 | #include "xmalloc.h" | 41 | #include "xmalloc.h" |
@@ -254,7 +254,7 @@ match_list(const char *client, const char *server, u_int *next) | |||
254 | ret = xstrdup(p); | 254 | ret = xstrdup(p); |
255 | if (next != NULL) | 255 | if (next != NULL) |
256 | *next = (cp == NULL) ? | 256 | *next = (cp == NULL) ? |
257 | strlen(c) : cp - c; | 257 | strlen(c) : (u_int)(cp - c); |
258 | xfree(c); | 258 | xfree(c); |
259 | xfree(s); | 259 | xfree(s); |
260 | return ret; | 260 | return ret; |