From 6a74a831510674f25c582b60bfb763489e0b538d Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 8 Sep 2005 09:08:13 +0000 Subject: r10072: Fix mismerge weridness in error handling. Andrew Bartlett (This used to be commit c17926b6fe278fd757862885f82fd342b755167c) --- source4/heimdal/lib/gssapi/accept_sec_context.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'source4/heimdal/lib/gssapi') diff --git a/source4/heimdal/lib/gssapi/accept_sec_context.c b/source4/heimdal/lib/gssapi/accept_sec_context.c index 7412d84eb0..8e354c3136 100644 --- a/source4/heimdal/lib/gssapi/accept_sec_context.c +++ b/source4/heimdal/lib/gssapi/accept_sec_context.c @@ -417,8 +417,9 @@ gsskrb5_acceptor_start &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 @@ gsskrb5_acceptor_start "\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 @@ gsskrb5_acceptor_start 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 @@ gsskrb5_acceptor_wait_for_dcestyle( 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; } -- cgit