rpms/krb5/devel krb5-1.6.3-ftp_glob_runique.patch, NONE, 1.1 krb5.spec, 1.160, 1.161 krb5-1.5-gssinit.patch, 1.1, NONE

[Nalin Somabhai Dahyabhai (nalin)]

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10828

Modified Files:
	krb5.spec 
Added Files:
	krb5-1.6.3-ftp_glob_runique.patch 
Removed Files:
	krb5-1.5-gssinit.patch 
Log Message:
- ftp: add patch to fix "runique on" case when globbing fixes applied
- stop adding a redundant but harmless call to initialize the gssapi internals


krb5-1.6.3-ftp_glob_runique.patch:

--- NEW FILE krb5-1.6.3-ftp_glob_runique.patch ---
Fix mget when runique is enabled and the globbing patch has been applied.
diff -up krb5/src/appl/gssftp/ftp/ftp.c krb5/src/appl/gssftp/ftp/ftp.c
--- krb5/src/appl/gssftp/ftp/ftp.c
+++ krb5/src/appl/gssftp/ftp/ftp.c
@@ -1188,7 +1188,8 @@ void recvrequest(char *cmd, char *volati
 				return;
 			}
 		}
-		else if (runique && (local = gunique(local)) == NULL) {
+		else if (runique && strcmp(cmd, "NLST") &&
+			 (local = gunique(local)) == NULL) {
 			(void) signal(SIGINT, oldintr);
 			code = -1;
 			return;


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- krb5.spec	25 Feb 2008 20:55:41 -0000	1.160
+++ krb5.spec	26 Feb 2008 21:18:38 -0000	1.161
@@ -75,7 +75,6 @@
 Patch40: krb5-1.4.1-telnet-environ.patch
 Patch41: krb5-1.2.7-login-lpass.patch
 Patch44: krb5-1.4.3-enospc.patch
-Patch45: krb5-1.5-gssinit.patch
 Patch47: krb5-1.6-sort-of-static.patch
 Patch51: krb5-1.6-ldap-init.patch
 Patch52: krb5-1.6-ldap-man.patch
@@ -96,6 +95,7 @@
 Patch70: krb5-trunk-kpasswd_tcp2.patch
 Patch71: krb5-1.6.2-dirsrv-accountlock.patch
 Patch72: krb5-1.6.3-ftp_fdleak.patch
+Patch73: krb5-1.6.3-ftp_glob_runique.patch
 
 License: MIT, freely distributable.
 URL: http://web.mit.edu/kerberos/www/
@@ -226,6 +226,10 @@
 certificate.
 
 %changelog
+* Tue Feb 26 2008 Nalin Dahyabhai <nalin at redhat.com>
+- ftp: add patch to fix "runique on" case when globbing fixes applied
+- stop adding a redundant but harmless call to initialize the gssapi internals
+
 * Mon Feb 25 2008 Nalin Dahyabhai <nalin at redhat.com>
 - add patch to suppress double-processing of /etc/krb5.conf when we build
   with --sysconfdir=/etc, thereby suppressing double-logging (#231147)
@@ -1304,7 +1308,6 @@
 %patch40 -p1 -b .telnet-environ
 %patch41 -p1 -b .login-lpass
 %patch44 -p1 -b .enospc
-%patch45 -p1 -b .gssinit
 %if %{build_static}
 %patch47 -p1 -b .sort-of-static
 %endif
@@ -1322,6 +1325,7 @@
 #%patch70 -p0 -b .kpasswd_tcp2
 %patch71 -p1 -b .dirsrv-accountlock
 %patch72 -p1 -b .ftp_fdleak
+%patch73 -p1 -b .ftp_glob_runique
 cp src/krb524/README README.krb524
 gzip doc/*.ps
 


--- krb5-1.5-gssinit.patch DELETED ---