- reapair clientloop crash (#627332)

This commit is contained in:
Jan F 2010-11-24 08:41:53 +01:00
parent e2350fc2db
commit 62f437b225
2 changed files with 19 additions and 1 deletions

View File

@ -0,0 +1,12 @@
diff -up openssh-5.6p1/clientloop.c.clientloop openssh-5.6p1/clientloop.c
--- openssh-5.6p1/clientloop.c.clientloop 2010-11-24 08:18:10.000000000 +0100
+++ openssh-5.6p1/clientloop.c 2010-11-24 08:18:11.000000000 +0100
@@ -1944,7 +1944,7 @@ client_input_channel_req(int type, u_int
}
packet_check_eom();
}
- if (reply) {
+ if (reply && c != NULL) {
packet_start(success ?
SSH2_MSG_CHANNEL_SUCCESS : SSH2_MSG_CHANNEL_FAILURE);
packet_put_int(c->remote_id);

View File

@ -70,7 +70,7 @@
%endif
# Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
%define openssh_rel 23
%define openssh_rel 24
%define openssh_ver 5.5p1
%define pam_ssh_agent_rel 26
%define pam_ssh_agent_ver 0.9.2
@ -134,6 +134,8 @@ Patch77: openssh-5.5p1-stderr.patch
#https://bugzilla.mindrot.org/show_bug.cgi?id=1780
Patch78: openssh-5.5p1-kuserok.patch
Patch79: openssh-5.5p1-x11.patch
#https://bugzilla.mindrot.org/show_bug.cgi?id=1842
Patch81: openssh-5.5p1-clientloop.patch
License: BSD
Group: Applications/Internet
@ -308,6 +310,7 @@ popd
%patch77 -p1 -b .stderr
%patch78 -p1 -b .kuserok
%patch79 -p1 -b .x11
%patch81 -p1 -b .clientloop
autoreconf
pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
@ -589,6 +592,9 @@ fi
%endif
%changelog
* Wed Nov 24 2010 Jan F. Chadima <jchadima@redhat.com> - 5.5p1-24 + 0.9.2-26
- reapair clientloop crash (#627332)
* Fri Nov 5 2010 Jan F. Chadima <jchadima@redhat.com> - 5.5p1-23 + 0.9.2-26
- update x11 patch (#648896)