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 /gss-genr.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 'gss-genr.c')
-rw-r--r-- | gss-genr.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gss-genr.c b/gss-genr.c index f9b39cfd5..3069347c2 100644 --- a/gss-genr.c +++ b/gss-genr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: gss-genr.c,v 1.20 2009/06/22 05:39:28 dtucker Exp $ */ | 1 | /* $OpenBSD: gss-genr.c,v 1.21 2013/05/17 00:13:13 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. | 4 | * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. |
@@ -101,8 +101,8 @@ ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check, | |||
101 | 101 | ||
102 | if (gss_enc2oid != NULL) { | 102 | if (gss_enc2oid != NULL) { |
103 | for (i = 0; gss_enc2oid[i].encoded != NULL; i++) | 103 | for (i = 0; gss_enc2oid[i].encoded != NULL; i++) |
104 | xfree(gss_enc2oid[i].encoded); | 104 | free(gss_enc2oid[i].encoded); |
105 | xfree(gss_enc2oid); | 105 | free(gss_enc2oid); |
106 | } | 106 | } |
107 | 107 | ||
108 | gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) * | 108 | gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) * |
@@ -159,7 +159,7 @@ ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check, | |||
159 | buffer_free(&buf); | 159 | buffer_free(&buf); |
160 | 160 | ||
161 | if (strlen(mechs) == 0) { | 161 | if (strlen(mechs) == 0) { |
162 | xfree(mechs); | 162 | free(mechs); |
163 | mechs = NULL; | 163 | mechs = NULL; |
164 | } | 164 | } |
165 | 165 | ||
@@ -214,8 +214,8 @@ void | |||
214 | ssh_gssapi_set_oid_data(Gssctxt *ctx, void *data, size_t len) | 214 | ssh_gssapi_set_oid_data(Gssctxt *ctx, void *data, size_t len) |
215 | { | 215 | { |
216 | if (ctx->oid != GSS_C_NO_OID) { | 216 | if (ctx->oid != GSS_C_NO_OID) { |
217 | xfree(ctx->oid->elements); | 217 | free(ctx->oid->elements); |
218 | xfree(ctx->oid); | 218 | free(ctx->oid); |
219 | } | 219 | } |
220 | ctx->oid = xmalloc(sizeof(gss_OID_desc)); | 220 | ctx->oid = xmalloc(sizeof(gss_OID_desc)); |
221 | ctx->oid->length = len; | 221 | ctx->oid->length = len; |
@@ -238,7 +238,7 @@ ssh_gssapi_error(Gssctxt *ctxt) | |||
238 | 238 | ||
239 | s = ssh_gssapi_last_error(ctxt, NULL, NULL); | 239 | s = ssh_gssapi_last_error(ctxt, NULL, NULL); |
240 | debug("%s", s); | 240 | debug("%s", s); |
241 | xfree(s); | 241 | free(s); |
242 | } | 242 | } |
243 | 243 | ||
244 | char * | 244 | char * |
@@ -319,8 +319,8 @@ ssh_gssapi_delete_ctx(Gssctxt **ctx) | |||
319 | if ((*ctx)->name != GSS_C_NO_NAME) | 319 | if ((*ctx)->name != GSS_C_NO_NAME) |
320 | gss_release_name(&ms, &(*ctx)->name); | 320 | gss_release_name(&ms, &(*ctx)->name); |
321 | if ((*ctx)->oid != GSS_C_NO_OID) { | 321 | if ((*ctx)->oid != GSS_C_NO_OID) { |
322 | xfree((*ctx)->oid->elements); | 322 | free((*ctx)->oid->elements); |
323 | xfree((*ctx)->oid); | 323 | free((*ctx)->oid); |
324 | (*ctx)->oid = GSS_C_NO_OID; | 324 | (*ctx)->oid = GSS_C_NO_OID; |
325 | } | 325 | } |
326 | if ((*ctx)->creds != GSS_C_NO_CREDENTIAL) | 326 | if ((*ctx)->creds != GSS_C_NO_CREDENTIAL) |
@@ -330,7 +330,7 @@ ssh_gssapi_delete_ctx(Gssctxt **ctx) | |||
330 | if ((*ctx)->client_creds != GSS_C_NO_CREDENTIAL) | 330 | if ((*ctx)->client_creds != GSS_C_NO_CREDENTIAL) |
331 | gss_release_cred(&ms, &(*ctx)->client_creds); | 331 | gss_release_cred(&ms, &(*ctx)->client_creds); |
332 | 332 | ||
333 | xfree(*ctx); | 333 | free(*ctx); |
334 | *ctx = NULL; | 334 | *ctx = NULL; |
335 | } | 335 | } |
336 | 336 | ||
@@ -377,7 +377,7 @@ ssh_gssapi_import_name(Gssctxt *ctx, const char *host) | |||
377 | &gssbuf, GSS_C_NT_HOSTBASED_SERVICE, &ctx->name))) | 377 | &gssbuf, GSS_C_NT_HOSTBASED_SERVICE, &ctx->name))) |
378 | ssh_gssapi_error(ctx); | 378 | ssh_gssapi_error(ctx); |
379 | 379 | ||
380 | xfree(gssbuf.value); | 380 | free(gssbuf.value); |
381 | return (ctx->major); | 381 | return (ctx->major); |
382 | } | 382 | } |
383 | 383 | ||