[krb5-appl] - add Siddhesh Poyarekar's patch to ensure that when performing an "mdir" or "mls" operation, that t

[Nalin Dahyabhai]

commit 9fee080d99d44b8e37f77c3fe1d88436922fe24d
Author: Nalin Dahyabhai <nalin at dahyabhai.net>
Date:   Mon Jan 23 18:19:08 2012 -0500

    - add Siddhesh Poyarekar's patch to ensure that when performing an "mdir" or "mls" operation, that the FTP client always passes an actually-terminated string as the open mode for fopen() (#773538, RT#7079)

 krb5-appl-ftp-mdir.patch |   21 +++++++++++++++++++++
 krb5-appl.spec           |    9 ++++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/krb5-appl-ftp-mdir.patch b/krb5-appl-ftp-mdir.patch
new file mode 100644
index 0000000..e34e2b2
--- /dev/null
+++ b/krb5-appl-ftp-mdir.patch
@@ -0,0 +1,21 @@
+--- a/gssftp/ftp/cmds.c	2012-01-12 13:06:12.827204828 +0530
++++ b/gssftp/ftp/cmds.c	2012-01-12 13:06:08.978204741 +0530
+@@ -1685,7 +1685,7 @@ void mls(argc, argv)
+ {
+ 	sig_t oldintr;
+ 	int ointer, i;
+-	char *volatile cmd, rmode[1], *dest;
++	char *volatile cmd, rmode[2], *dest;
+ 
+ 	if (argc < 2 && !another(&argc, &argv, "remote-files"))
+ 		goto usage;
+@@ -1709,7 +1709,8 @@ usage:
+ 	oldintr = signal(SIGINT, mabort);
+ 	(void) setjmp(jabort);
+ 	for (i = 1; mflag && i < argc-1; ++i) {
+-		*rmode = (i == 1) ? 'w' : 'a';
++		rmode[0] = (i == 1) ? 'w' : 'a';
++		rmode[1] = 0;
+ 		recvrequest(cmd, dest, argv[i], rmode, 0, 0);
+ 		if (!mflag && fromatty) {
+ 			ointer = interactive;
diff --git a/krb5-appl.spec b/krb5-appl.spec
index 5f2b64c..1f614b9 100644
--- a/krb5-appl.spec
+++ b/krb5-appl.spec
@@ -10,7 +10,7 @@
 Summary: Kerberos-aware versions of telnet, ftp, rsh, and rlogin
 Name: krb5-appl
 Version: 1.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5-appl/1.0/krb5-appl-1.0.2-signed.tar
 Source0: krb5-appl-%{version}.tar.gz
@@ -46,6 +46,7 @@ Patch79: krb5-trunk-ftp_mget_case.patch
 Patch88: krb5-1.7-sizeof.patch
 Patch89: krb5-appl-1.0.1-largefile.patch
 Patch92: http://web.mit.edu/kerberos/advisories/2011-008-patch.txt
+Patch93: krb5-appl-ftp-mdir.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
@@ -104,6 +105,7 @@ ln -s NOTICE LICENSE
 %patch88 -p3 -b .sizeof
 %patch89 -p1 -b .largefile
 %patch92 -p1 -b .2011-008
+%patch93 -p1 -b .mdir
 
 # Rename the man pages so that they'll get generated correctly.  Uses the
 # "krb5-appl-1.0-manpaths.txt" source file.
@@ -253,6 +255,11 @@ exit 0
 %{krb5prefix}/man/man8/telnetd.8*
 
 %changelog
+* Mon Jan 23 2012 Nalin Dahyabhai <nalin at redhat.com> - 1.0.2-4
+- add Siddhesh Poyarekar's patch to ensure that when performing an "mdir"
+  or "mls" operation, that the FTP client always passes an actually-terminated
+  string as the open mode for fopen() (#773538, RT#7079)
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild