diff options
author | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
commit | 327155e6824b3ee13837bdde04e4eb47e147ff46 (patch) | |
tree | 8f8743122403c7a2e6ed919156711fb1520c657f /match.c | |
parent | 0334ce32304e9ba2a10ee5ca49ca6e8ff3ba6cf4 (diff) | |
parent | 74e339b8f8936bc0d985e053a076d0c9b5e9ea51 (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.3).
- sftp(1): add support for resuming partial downloads using the "reget"
command and on the sftp commandline or on the "get" commandline using
the "-a" (append) option (closes: #158590).
- ssh(1): add an "IgnoreUnknown" configuration option to selectively
suppress errors arising from unknown configuration directives (closes:
#436052).
- sftp(1): update progressmeter when data is acknowledged, not when it's
sent (partially addresses #708372).
- ssh(1): do not fatally exit when attempting to cleanup multiplexing-
created channels that are incompletely opened (closes: #651357).
Diffstat (limited to 'match.c')
-rw-r--r-- | match.c | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: match.c,v 1.27 2008/06/10 23:06:19 djm Exp $ */ | 1 | /* $OpenBSD: match.c,v 1.28 2013/05/17 00:13:13 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -40,6 +40,7 @@ | |||
40 | #include <sys/types.h> | 40 | #include <sys/types.h> |
41 | 41 | ||
42 | #include <ctype.h> | 42 | #include <ctype.h> |
43 | #include <stdlib.h> | ||
43 | #include <string.h> | 44 | #include <string.h> |
44 | 45 | ||
45 | #include "xmalloc.h" | 46 | #include "xmalloc.h" |
@@ -226,14 +227,14 @@ match_user(const char *user, const char *host, const char *ipaddr, | |||
226 | 227 | ||
227 | if ((ret = match_pattern(user, pat)) == 1) | 228 | if ((ret = match_pattern(user, pat)) == 1) |
228 | ret = match_host_and_ip(host, ipaddr, p); | 229 | ret = match_host_and_ip(host, ipaddr, p); |
229 | xfree(pat); | 230 | free(pat); |
230 | 231 | ||
231 | return ret; | 232 | return ret; |
232 | } | 233 | } |
233 | 234 | ||
234 | /* | 235 | /* |
235 | * Returns first item from client-list that is also supported by server-list, | 236 | * Returns first item from client-list that is also supported by server-list, |
236 | * caller must xfree() returned string. | 237 | * caller must free the returned string. |
237 | */ | 238 | */ |
238 | #define MAX_PROP 40 | 239 | #define MAX_PROP 40 |
239 | #define SEP "," | 240 | #define SEP "," |
@@ -264,15 +265,15 @@ match_list(const char *client, const char *server, u_int *next) | |||
264 | if (next != NULL) | 265 | if (next != NULL) |
265 | *next = (cp == NULL) ? | 266 | *next = (cp == NULL) ? |
266 | strlen(c) : (u_int)(cp - c); | 267 | strlen(c) : (u_int)(cp - c); |
267 | xfree(c); | 268 | free(c); |
268 | xfree(s); | 269 | free(s); |
269 | return ret; | 270 | return ret; |
270 | } | 271 | } |
271 | } | 272 | } |
272 | } | 273 | } |
273 | if (next != NULL) | 274 | if (next != NULL) |
274 | *next = strlen(c); | 275 | *next = strlen(c); |
275 | xfree(c); | 276 | free(c); |
276 | xfree(s); | 277 | free(s); |
277 | return NULL; | 278 | return NULL; |
278 | } | 279 | } |