rpms/krb5/devel krb5-1.7-spnego-deleg.patch, 1.2, 1.3 krb5.spec, 1.221, 1.222

[Nalin Dahyabhai]

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14478

Modified Files:
	krb5-1.7-spnego-deleg.patch krb5.spec 
Log Message:
refresh patch for #542868 from trunk


krb5-1.7-spnego-deleg.patch:
 gssapiP_spnego.h |    9 +++++++++
 spnego_mech.c    |   17 ++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

Index: krb5-1.7-spnego-deleg.patch
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5-1.7-spnego-deleg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- krb5-1.7-spnego-deleg.patch	11 Dec 2009 18:08:12 -0000	1.2
+++ krb5-1.7-spnego-deleg.patch	21 Dec 2009 19:27:25 -0000	1.3
@@ -1,15 +1,13 @@
 Punt a set_cred_option() call down to the mechanism for the first
 credential that we have whose mechanism implements a set_cred_option()
-method.  Not completely sure this is the correct fix, as we may need to
-change gssspi_set_cred_option() to keep going if it gets GSS_S_UNAVAILABLE
-back from the mechanism-specific function (which is what the Kerberos
-mechanism, previously the only provider of a set_cred_option(), returns
-if it doesn't understand the request). RT#6594
+method.  It's not the complete set of changes from 1.7 to trunk, but
+it should be enough to make gss_krb5_copy_ccache() work.  RT#6594
 
-diff -up krb5/src/lib/gssapi/spnego/gssapiP_spnego.h krb5/src/lib/gssapi/spnego/gssapiP_spnego.h
---- krb5/src/lib/gssapi/spnego/gssapiP_spnego.h	2009-12-08 14:46:57.000000000 -0500
-+++ krb5/src/lib/gssapi/spnego/gssapiP_spnego.h	2009-12-08 14:46:20.000000000 -0500
-@@ -333,6 +333,15 @@ spnego_gss_inquire_sec_context_by_oid
+Index: src/lib/gssapi/spnego/gssapiP_spnego.h
+===================================================================
+--- src/lib/gssapi/spnego/gssapiP_spnego.h	(revision 23481)
++++ src/lib/gssapi/spnego/gssapiP_spnego.h	(revision 23482)
+@@ -352,6 +352,15 @@
  );
  
  OM_uint32
@@ -25,19 +23,20 @@ diff -up krb5/src/lib/gssapi/spnego/gssa
  spnego_gss_set_sec_context_option
  (
  	OM_uint32 *minor_status,
-diff -up krb5/src/lib/gssapi/spnego/spnego_mech.c krb5/src/lib/gssapi/spnego/spnego_mech.c
---- krb5/src/lib/gssapi/spnego/spnego_mech.c	2009-12-08 14:47:01.000000000 -0500
-+++ krb5/src/lib/gssapi/spnego/spnego_mech.c	2009-12-08 14:46:20.000000000 -0500
-@@ -250,7 +250,7 @@ static struct gss_config spnego_mechanis
+Index: src/lib/gssapi/spnego/spnego_mech.c
+===================================================================
+--- src/lib/gssapi/spnego/spnego_mech.c	
++++ src/lib/gssapi/spnego/spnego_mech.c	(revision 23482)
+@@ -250,7 +250,7 @@
   	spnego_gss_inquire_sec_context_by_oid, /* gss_inquire_sec_context_by_oid */
   	NULL,				/* gss_inquire_cred_by_oid */
   	spnego_gss_set_sec_context_option, /* gss_set_sec_context_option */
 - 	NULL,				/* gssspi_set_cred_option */
-+ 	spnego_gss_set_cred_option,	/* gssspi_set_cred_option */
++	spnego_gss_set_cred_option,	/* gssspi_set_cred_option */
   	NULL,				/* gssspi_mech_invoke */
  	spnego_gss_wrap_aead,
  	spnego_gss_unwrap_aead,
-@@ -2081,6 +2081,21 @@ spnego_gss_inquire_sec_context_by_oid(
+@@ -2187,6 +2187,21 @@
  }
  
  OM_uint32


Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -p -r1.221 -r1.222
--- krb5.spec	10 Dec 2009 22:50:50 -0000	1.221
+++ krb5.spec	21 Dec 2009 19:27:25 -0000	1.222
@@ -10,7 +10,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.7
-Release: 13%{?dist}
+Release: 14%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -216,6 +216,9 @@ to obtain initial credentials from a KDC
 certificate.
 
 %changelog
+* Mon Dec 21 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-14
+- refresh patch for #542868 from trunk
+
 * Thu Dec 10 2009 Nalin Dahyabhai <nalin at redhat.com>
 - move man pages that live in the -libs subpackage into the regular
   %%{_mandir} tree where they'll still be found if that package is the
@@ -1516,7 +1519,7 @@ popd
 %patch88 -p1 -b .sizeof
 %patch89 -p1 -b .largefile
 %patch90 -p0 -b .openssl-1.0
-%patch91 -p1 -b .spnego-deleg
+%patch91 -p0 -b .spnego-deleg
 gzip doc/*.ps
 
 sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex