From 2b400202856dde3e66b014531f6b34c7e5179441 Mon Sep 17 00:00:00 2001
From: Jan F. Chadima <jfch2222@fedoraproject.org>
Date: May 31 2010 10:17:45 +0000
Subject: - parsing authorised file (#595935)


---

diff --git a/openssh-5.4p1-595935.patch b/openssh-5.4p1-595935.patch
new file mode 100644
index 0000000..0b915a4
--- /dev/null
+++ b/openssh-5.4p1-595935.patch
@@ -0,0 +1,22 @@
+diff -urN openssh-5.4p1/servconf.c /repo/openssh/595935/openssh/devel/openssh-5.5p1/servconf.c
+--- openssh-5.4p1/servconf.c	2010-05-31 09:55:22.000000000 +0200
++++ /repo/openssh/595935/openssh/devel/openssh-5.5p1/servconf.c	2010-05-31 09:56:13.000000000 +0200
+@@ -1271,7 +1270,17 @@
+ 		charptr = (opcode == sAuthorizedKeysFile) ?
+ 		    &options->authorized_keys_file :
+ 		    &options->authorized_keys_file2;
+-		goto parse_filename;
++		arg = strdelim(&cp);
++		if (!arg || *arg == '\0')
++			fatal("%s line %d: missing file name.",
++			    filename, linenum);
++		if (*activep && *charptr == NULL) {
++			*charptr = tilde_expand_filename(arg, getuid());
++			/* increase optional counter */
++			if (intptr != NULL)
++				*intptr = *intptr + 1;
++		}
++		break;
+ 
+ 	case sClientAliveInterval:
+ 		intptr = &options->client_alive_interval;
diff --git a/openssh.spec b/openssh.spec
index 15cff76..6b8840b 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -67,7 +67,7 @@
 %endif
 
 # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
-%define openssh_rel 2
+%define openssh_rel 3
 %define pam_ssh_agent_rel 24
 %define pam_ssh_agent_ver 0.9.2
 
@@ -111,6 +111,7 @@ Patch72: openssh-5.4p1-pka.patch
 Patch73: openssh-5.4p1-gsskex.patch
 Patch74: openssh-5.3p1-randclean.patch
 Patch75: openssh-5.3p1-dso.patch
+Patch76: openssh-5.4p1-595935.patch
 
 License: BSD
 Group: Applications/Internet
@@ -264,6 +265,7 @@ popd
 %patch73 -p1 -b .gsskex
 %patch74 -p1 -b .randclean
 %patch75 -p1 -b .dso
+%patch76 -p1 -b .bz595935
 
 autoreconf
 
@@ -527,6 +529,9 @@ fi
 %endif
 
 %changelog
+* Mon May 31 2010 Jan F. Chadima <jchadima@redhat.com> - 5.4p1-3
+- parsing authorised file (#595935)
+
 * Fri May 21 2010 Jan F. Chadima <jchadima@redhat.com> - 5.4p1-2
 - synchronize uid and gid for the user sshd