From 6a2cfe2190bc892ca38c36fb12b6bdf747621c29 Mon Sep 17 00:00:00 2001
From: Jan F. Chadima <jfch@eglon.jagda.eu>
Date: Jun 09 2011 14:10:59 +0000
Subject: remove stale control sockets (#706396)


---

diff --git a/openssh-5.8p2-remove-stale-control-socket.patch b/openssh-5.8p2-remove-stale-control-socket.patch
new file mode 100644
index 0000000..4a25d9e
--- /dev/null
+++ b/openssh-5.8p2-remove-stale-control-socket.patch
@@ -0,0 +1,13 @@
+diff -up openssh-5.8p2/mux.c.remove_stale openssh-5.8p2/mux.c
+--- openssh-5.8p2/mux.c.remove_stale	2011-01-14 02:01:32.000000000 +0100
++++ openssh-5.8p2/mux.c	2011-06-09 15:27:42.556360291 +0200
+@@ -1867,6 +1867,9 @@ muxclient(const char *path)
+ 			unlink(path);
+ 		} else if (errno == ENOENT) {
+ 			debug("Control socket \"%.100s\" does not exist", path);
++		} else if (errno == ECONNREFUSED) {
++			debug("Removing stale control socket \"%.100s\"", path);
++			unlink(path);
+ 		} else {
+ 			error("Control socket connect(%.100s): %s", path,
+ 			    strerror(errno));
diff --git a/openssh.spec b/openssh.spec
index 05dd087..d4536a7 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -74,7 +74,7 @@
 
 # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
 %define openssh_ver 5.8p2
-%define openssh_rel 5
+%define openssh_rel 6
 %define pam_ssh_agent_ver 0.9.2
 %define pam_ssh_agent_rel 31
 
@@ -183,6 +183,8 @@ Patch62: openssh-5.8p1-localdomain.patch
 Patch63: openssh-5.8p2-force_krb.patch
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1780
 Patch64: openssh-5.8p2-kuserok.patch
+#https://bugzilla.mindrot.org/show_bug.cgi?id=1329 (WONTFIX)
+Patch65: openssh-5.8p2-remove-stale-control-socket.patch
 #---
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1604
 # sctp
@@ -387,6 +389,7 @@ popd
 %patch62 -p1 -b .localdomain
 %patch63 -p1 -b .force_krb
 %patch64 -p1 -b .kuserok
+%patch65 -p1 -b .remove_stale
 
 autoreconf
 pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
@@ -739,6 +742,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Jun  9 2011 Jan F. Chadima <jchadima@redhat.com> - 5.8p2-6 + 0.9.2-31
+- remove stale control sockets (#706396)
+
 * Tue May 31 2011 Jan F. Chadima <jchadima@redhat.com> - 5.8p2-5 + 0.9.2-31
 - improove entropy manuals