[mod_auth_kerb/f15] Updated s4u2proxy patch to add missing braces around conditional.

[rcritten]

commit 066abc51a723580f3cfe60485b68cfbe064d3ddd
Author: Rob Crittenden <rcritten at redhat.com>
Date:   Thu Mar 1 14:29:43 2012 -0500

    Updated s4u2proxy patch to add missing braces around conditional.

 mod_auth_kerb-5.4-s4u2proxy.patch |   15 ++++++++-------
 mod_auth_kerb.spec                |    7 +++++--
 2 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/mod_auth_kerb-5.4-s4u2proxy.patch b/mod_auth_kerb-5.4-s4u2proxy.patch
index d1793c6..23185f3 100644
--- a/mod_auth_kerb-5.4-s4u2proxy.patch
+++ b/mod_auth_kerb-5.4-s4u2proxy.patch
@@ -20,7 +20,7 @@ diff -up --recursive mod_auth_kerb-5.4.orig/README mod_auth_kerb-5.4/README
  $Id: README,v 1.12 2008/09/17 14:01:55 baalberith Exp $
 diff -up --recursive mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c mod_auth_kerb-5.4/src/mod_auth_kerb.c
 --- mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c	2011-12-09 17:55:05.000000000 -0500
-+++ mod_auth_kerb-5.4/src/mod_auth_kerb.c	2012-01-31 15:05:47.000000000 -0500
++++ mod_auth_kerb-5.4/src/mod_auth_kerb.c	2012-03-01 14:19:40.000000000 -0500
 @@ -42,6 +42,31 @@
   * POSSIBILITY OF SUCH DAMAGE.
   */
@@ -148,13 +148,14 @@ diff -up --recursive mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c mod_auth_kerb-5.
     char buf[1024];
     int have_server_princ;
  
-@@ -1212,10 +1276,13 @@ get_gss_creds(request_rec *r,
+@@ -1212,10 +1276,14 @@ get_gss_creds(request_rec *r,
  
     log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "Acquiring creds for %s",
  	      token.value);
-+   if (conf->krb5_s4u2proxy)
++   if (conf->krb5_s4u2proxy) {
 +       usage = GSS_C_BOTH;
 +       obtain_server_credentials(r, conf->krb_service_name);
++   }
     gss_release_buffer(&minor_status, &token);
     
     major_status = gss_acquire_cred(&minor_status, server_name, GSS_C_INDEFINITE,
@@ -163,7 +164,7 @@ diff -up --recursive mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c mod_auth_kerb-5.
  				   server_creds, NULL, NULL);
     gss_release_name(&minor_status2, &server_name);
     if (GSS_ERROR(major_status)) {
-@@ -1257,6 +1324,293 @@ cmp_gss_type(gss_buffer_t token, gss_OID
+@@ -1257,6 +1325,293 @@ cmp_gss_type(gss_buffer_t token, gss_OID
  }
  #endif
  
@@ -457,7 +458,7 @@ diff -up --recursive mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c mod_auth_kerb-5.
  static int
  authenticate_user_gss(request_rec *r, kerb_auth_config *conf,
  		      const char *auth_line, char **negotiate_ret_value)
-@@ -1697,10 +2051,60 @@ have_rcache_type(const char *type)
+@@ -1697,10 +2052,60 @@ have_rcache_type(const char *type)
  /*************************************************************************** 
   Module Setup/Configuration
   ***************************************************************************/
@@ -518,7 +519,7 @@ diff -up --recursive mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c mod_auth_kerb-5.
  #ifndef HEIMDAL
     /* Suppress the MIT replay cache.  Requires MIT Kerberos 1.4.0 or later.
        1.3.x are covered by the hack overiding the replay calls */
-@@ -1741,6 +2145,7 @@ static int
+@@ -1741,6 +2146,7 @@ static int
  kerb_init_handler(apr_pool_t *p, apr_pool_t *plog,
        		  apr_pool_t *ptemp, server_rec *s)
  {
@@ -526,7 +527,7 @@ diff -up --recursive mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c mod_auth_kerb-5.
     ap_add_version_component(p, "mod_auth_kerb/" MODAUTHKERB_VERSION);
  #ifndef HEIMDAL
     /* Suppress the MIT replay cache.  Requires MIT Kerberos 1.4.0 or later.
-@@ -1748,14 +2153,41 @@ kerb_init_handler(apr_pool_t *p, apr_poo
+@@ -1748,14 +2154,41 @@ kerb_init_handler(apr_pool_t *p, apr_poo
     if (getenv("KRB5RCACHETYPE") == NULL && have_rcache_type("none"))
        putenv(strdup("KRB5RCACHETYPE=none"));
  #endif
diff --git a/mod_auth_kerb.spec b/mod_auth_kerb.spec
index 4c119b2..7d849e0 100644
--- a/mod_auth_kerb.spec
+++ b/mod_auth_kerb.spec
@@ -2,7 +2,7 @@
 Summary: Kerberos authentication module for HTTP
 Name: mod_auth_kerb
 Version: 5.4
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: BSD and MIT and ASL 2.0
 Group: System Environment/Daemons
 URL: http://modauthkerb.sourceforge.net/
@@ -55,8 +55,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/modules/*.so
 
 %changelog
+* Thu Mar  1 2012 Rob Crittenden <rcritten at redhat.com> - 5.4-9
+- Updated s4u2proxy patch to add missing braces around conditional.
+
 * Tue Jan 31 2012 Rob Crittenden <rcritten at redhat.com> - 5.4-8
-- Add support for Constrained Delegation/su42proxy (#767740)
+- Add support for Constrained Delegation/s4u2proxy (#767740)
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild