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 /openbsd-compat/port-linux.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 'openbsd-compat/port-linux.c')
-rw-r--r-- | openbsd-compat/port-linux.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c index 2b8a14a59..de6ad3fd7 100644 --- a/openbsd-compat/port-linux.c +++ b/openbsd-compat/port-linux.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: port-linux.c,v 1.17 2012/03/08 23:25:18 djm Exp $ */ | 1 | /* $Id: port-linux.c,v 1.18 2013/06/01 22:07:32 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com> | 4 | * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com> |
@@ -109,10 +109,8 @@ ssh_selinux_getctxbyname(char *pwname, const char *role) | |||
109 | } | 109 | } |
110 | 110 | ||
111 | #ifdef HAVE_GETSEUSERBYNAME | 111 | #ifdef HAVE_GETSEUSERBYNAME |
112 | if (sename != NULL) | 112 | free(sename); |
113 | xfree(sename); | 113 | free(lvl); |
114 | if (lvl != NULL) | ||
115 | xfree(lvl); | ||
116 | #endif | 114 | #endif |
117 | 115 | ||
118 | return sc; | 116 | return sc; |
@@ -230,8 +228,8 @@ ssh_selinux_change_context(const char *newname) | |||
230 | if (setcon(newctx) < 0) | 228 | if (setcon(newctx) < 0) |
231 | switchlog("%s: setcon %s from %s failed with %s", __func__, | 229 | switchlog("%s: setcon %s from %s failed with %s", __func__, |
232 | newctx, oldctx, strerror(errno)); | 230 | newctx, oldctx, strerror(errno)); |
233 | xfree(oldctx); | 231 | free(oldctx); |
234 | xfree(newctx); | 232 | free(newctx); |
235 | } | 233 | } |
236 | 234 | ||
237 | void | 235 | void |