diff options
author | Darren Tucker <dtucker@zip.com.au> | 2013-06-02 08:07:31 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2013-06-02 08:07:31 +1000 |
commit | f60845fde29cead9d75e812db1c04916b4c58ffd (patch) | |
tree | a69fe76f6dd73057e46625867d1b4282e8a5a040 /monitor.c | |
parent | 12f6533215c0a36ab29d11ff52a853fce45573b4 (diff) |
- (dtucker) [M auth-chall.c auth-krb5.c auth-pam.c cipher-aes.c cipher-ctr.c
groupaccess.c loginrec.c monitor.c monitor_wrap.c session.c sshd.c
sshlogin.c uidswap.c openbsd-compat/bsd-cygwin_util.c
openbsd-compat/getrrsetbyname-ldns.c openbsd-compat/port-aix.c
openbsd-compat/port-linux.c] Replace portable-specific instances of xfree
with the equivalent calls to free.
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 20 |
1 files changed, 9 insertions, 11 deletions
@@ -988,7 +988,7 @@ mm_answer_skeyrespond(int sock, Buffer *m) | |||
988 | skey_haskey(authctxt->pw->pw_name) == 0 && | 988 | skey_haskey(authctxt->pw->pw_name) == 0 && |
989 | skey_passcheck(authctxt->pw->pw_name, response) != -1); | 989 | skey_passcheck(authctxt->pw->pw_name, response) != -1); |
990 | 990 | ||
991 | xfree(response); | 991 | free(response); |
992 | 992 | ||
993 | buffer_clear(m); | 993 | buffer_clear(m); |
994 | buffer_put_int(m, authok); | 994 | buffer_put_int(m, authok); |
@@ -1073,19 +1073,17 @@ mm_answer_pam_query(int sock, Buffer *m) | |||
1073 | buffer_clear(m); | 1073 | buffer_clear(m); |
1074 | buffer_put_int(m, ret); | 1074 | buffer_put_int(m, ret); |
1075 | buffer_put_cstring(m, name); | 1075 | buffer_put_cstring(m, name); |
1076 | xfree(name); | 1076 | free(name); |
1077 | buffer_put_cstring(m, info); | 1077 | buffer_put_cstring(m, info); |
1078 | xfree(info); | 1078 | free(info); |
1079 | buffer_put_int(m, num); | 1079 | buffer_put_int(m, num); |
1080 | for (i = 0; i < num; ++i) { | 1080 | for (i = 0; i < num; ++i) { |
1081 | buffer_put_cstring(m, prompts[i]); | 1081 | buffer_put_cstring(m, prompts[i]); |
1082 | xfree(prompts[i]); | 1082 | free(prompts[i]); |
1083 | buffer_put_int(m, echo_on[i]); | 1083 | buffer_put_int(m, echo_on[i]); |
1084 | } | 1084 | } |
1085 | if (prompts != NULL) | 1085 | free(prompts); |
1086 | xfree(prompts); | 1086 | free(echo_on); |
1087 | if (echo_on != NULL) | ||
1088 | xfree(echo_on); | ||
1089 | auth_method = "keyboard-interactive"; | 1087 | auth_method = "keyboard-interactive"; |
1090 | auth_submethod = "pam"; | 1088 | auth_submethod = "pam"; |
1091 | mm_request_send(sock, MONITOR_ANS_PAM_QUERY, m); | 1089 | mm_request_send(sock, MONITOR_ANS_PAM_QUERY, m); |
@@ -1108,8 +1106,8 @@ mm_answer_pam_respond(int sock, Buffer *m) | |||
1108 | resp[i] = buffer_get_string(m, NULL); | 1106 | resp[i] = buffer_get_string(m, NULL); |
1109 | ret = (sshpam_device.respond)(sshpam_ctxt, num, resp); | 1107 | ret = (sshpam_device.respond)(sshpam_ctxt, num, resp); |
1110 | for (i = 0; i < num; ++i) | 1108 | for (i = 0; i < num; ++i) |
1111 | xfree(resp[i]); | 1109 | free(resp[i]); |
1112 | xfree(resp); | 1110 | free(resp); |
1113 | } else { | 1111 | } else { |
1114 | ret = (sshpam_device.respond)(sshpam_ctxt, num, NULL); | 1112 | ret = (sshpam_device.respond)(sshpam_ctxt, num, NULL); |
1115 | } | 1113 | } |
@@ -1764,7 +1762,7 @@ mm_answer_audit_command(int socket, Buffer *m) | |||
1764 | cmd = buffer_get_string(m, &len); | 1762 | cmd = buffer_get_string(m, &len); |
1765 | /* sanity check command, if so how? */ | 1763 | /* sanity check command, if so how? */ |
1766 | audit_run_command(cmd); | 1764 | audit_run_command(cmd); |
1767 | xfree(cmd); | 1765 | free(cmd); |
1768 | return (0); | 1766 | return (0); |
1769 | } | 1767 | } |
1770 | #endif /* SSH_AUDIT_EVENTS */ | 1768 | #endif /* SSH_AUDIT_EVENTS */ |