sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

r10072: Fix mismerge weridness in error handling.

Browse Source 
Andrew Bartlett
(This used to be commit c17926b6fe)
This commit is contained in:
Andrew Bartlett 2005-09-08 09:08:13 +00:00 committed by Gerald (Jerry) Carter
parent e6190e6be5
commit 6a74a83151
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source4/heimdal/lib/gssapi/accept_sec_context.c
View File

@ -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;
}