summaryrefslogtreecommitdiff
path: root/source4/heimdal/lib/gssapi/accept_sec_context.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-09-08 09:08:13 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:36:34 -0500
commit6a74a831510674f25c582b60bfb763489e0b538d (patch)
tree5f1b2f77c707d44e778d74275b2a8493124e87e4 /source4/heimdal/lib/gssapi/accept_sec_context.c
parente6190e6be55c8e6037b0cb2b357e133f5b313a02 (diff)
downloadsamba-6a74a831510674f25c582b60bfb763489e0b538d.tar.gz
samba-6a74a831510674f25c582b60bfb763489e0b538d.tar.bz2
samba-6a74a831510674f25c582b60bfb763489e0b538d.zip
r10072: Fix mismerge weridness in error handling.
Andrew Bartlett (This used to be commit c17926b6fe278fd757862885f82fd342b755167c)
Diffstat (limited to 'source4/heimdal/lib/gssapi/accept_sec_context.c')
-rw-r--r--source4/heimdal/lib/gssapi/accept_sec_context.c19
1 files changed, 12 insertions, 7 deletions
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;
}