rpms/krb5
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- ftp: add patch to fix "runique on" case when globbing fixes applied

Browse Source 
- stop adding a redundant but harmless call to initialize the gssapi
    internals
This commit is contained in:
Nalin Dahyabhai 2008-02-26 21:18:38 +00:00
parent 2a567feda3
commit d4963922a8
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
krb5-1.5-gssinit.patch
View File

@ -1,19 +0,0 @@
Don't crash in gss_release_oid() when the application is doing nothing
more than importing a name and freeing it (gss_release_name() calls
gss_release_oid(), but gss_import_name() doesn't initialize the library,
so gss_release_oid() hits an assertion failure when it tries to lock the
mechanism list).
Upstream RT #4088/4096.
--- krb5-1.5/src/lib/gssapi/mechglue/g_initialize.c 2006-08-07 13:10:19.000000000 -0400
+++ krb5-1.5/src/lib/gssapi/mechglue/g_initialize.c 2006-08-07 13:10:13.000000000 -0400
@@ -91,6 +91,8 @@
if (minor_status == NULL)
return (GSS_S_CALL_INACCESSIBLE_WRITE);
+ if (gssint_initialize_library())
+ return GSS_S_FAILURE;
*minor_status = 0;

14
krb5-1.6.3-ftp_glob_runique.patch Normal file
View File

@ -0,0 +1,14 @@
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;

8
krb5.spec
View File

@ -75,7 +75,6 @@ Patch39: krb5-1.4.1-api.patch
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 @@ Patch69: krb5-trunk-seqnum.patch
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 @@ to obtain initial credentials from a KDC using a private key and a
certificate.
%changelog
* Tue Feb 26 2008 Nalin Dahyabhai <nalin@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@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 @@ popd
%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 @@ popd
#%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