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 /auth-chall.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 'auth-chall.c')
-rw-r--r-- | auth-chall.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/auth-chall.c b/auth-chall.c index 919b1eaa4..0005aa88b 100644 --- a/auth-chall.c +++ b/auth-chall.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth-chall.c,v 1.12 2006/08/03 03:34:41 deraadt Exp $ */ | 1 | /* $OpenBSD: auth-chall.c,v 1.13 2013/05/17 00:13:13 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -69,11 +69,11 @@ get_challenge(Authctxt *authctxt) | |||
69 | fatal("get_challenge: numprompts < 1"); | 69 | fatal("get_challenge: numprompts < 1"); |
70 | challenge = xstrdup(prompts[0]); | 70 | challenge = xstrdup(prompts[0]); |
71 | for (i = 0; i < numprompts; i++) | 71 | for (i = 0; i < numprompts; i++) |
72 | xfree(prompts[i]); | 72 | free(prompts[i]); |
73 | xfree(prompts); | 73 | free(prompts); |
74 | xfree(name); | 74 | free(name); |
75 | xfree(echo_on); | 75 | free(echo_on); |
76 | xfree(info); | 76 | free(info); |
77 | 77 | ||
78 | return (challenge); | 78 | return (challenge); |
79 | } | 79 | } |
@@ -102,11 +102,11 @@ verify_response(Authctxt *authctxt, const char *response) | |||
102 | authenticated = 1; | 102 | authenticated = 1; |
103 | 103 | ||
104 | for (i = 0; i < numprompts; i++) | 104 | for (i = 0; i < numprompts; i++) |
105 | xfree(prompts[i]); | 105 | free(prompts[i]); |
106 | xfree(prompts); | 106 | free(prompts); |
107 | xfree(name); | 107 | free(name); |
108 | xfree(echo_on); | 108 | free(echo_on); |
109 | xfree(info); | 109 | free(info); |
110 | break; | 110 | break; |
111 | } | 111 | } |
112 | device->free_ctx(authctxt->kbdintctxt); | 112 | device->free_ctx(authctxt->kbdintctxt); |