svn commit: samba r10072 - in branches/SAMBA_4_0/source/heimdal/lib/gssapi: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-09-08 09:08:13 +0000 (Thu, 08 Sep 2005)
New Revision: 10072

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10072

Log:
Fix mismerge weridness in error handling.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/heimdal/lib/gssapi/accept_sec_context.c


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal/lib/gssapi/accept_sec_context.c
===================================================================
--- branches/SAMBA_4_0/source/heimdal/lib/gssapi/accept_sec_context.c	2005-09-08 08:18:08 UTC (rev 10071)
+++ branches/SAMBA_4_0/source/heimdal/lib/gssapi/accept_sec_context.c	2005-09-08 09:08:13 UTC (rev 10072)
@@ -417,8 +417,9 @@
 					       &flags,
 					       &fwd_data);
 	krb5_free_authenticator(gssapi_krb5_context, &authenticator);
-	if (ret)
-	    if (ret) return ret;
+	if (ret) {
+	    return ret;
+	}
     }
     
     if(flags & GSS_C_MUTUAL_FLAG) {
@@ -451,7 +452,9 @@
 						  "\x02\x00",
 						  GSS_KRB5_MECHANISM);
 		    krb5_data_free (&outbuf);
-		    if (ret) return ret;
+		    if (ret) {
+			    return ret;
+		    }
 	    } else {
 		    output_token->length	= outbuf.length;
 		    output_token->value	= outbuf.data;
@@ -479,8 +482,9 @@
 	ret = gssapi_lifetime_left(minor_status,
 				   (*context_handle)->lifetime,
 				   time_rec);
-	if (ret)
-	    if (ret) return ret;
+	if (ret) {
+	    return ret;
+	}
     }
 
     /*
@@ -600,8 +604,9 @@
 		ret = gssapi_lifetime_left(minor_status,
 					   (*context_handle)->lifetime,
 					   &lifetime_rec);
-		if (ret) return ret;
-
+		if (ret) {
+			return ret;
+		}
 		if (lifetime_rec == 0) {
 			return GSS_S_CONTEXT_EXPIRED;
 		}