sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-10 04:23:50 +03:00
Code Activity

r10072: Fix mismerge weridness in error handling.

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

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

@@ -417,8 +417,9 @@ gsskrb5_acceptor_start
&flags, &flags,
&fwd_data); &fwd_data);
krb5_free_authenticator(gssapi_krb5_context, &authenticator); krb5_free_authenticator(gssapi_krb5_context, &authenticator);
if (ret) if (ret) {
if (ret) return ret; return ret;
}
} }
if(flags & GSS_C_MUTUAL_FLAG) { if(flags & GSS_C_MUTUAL_FLAG) {
@@ -451,7 +452,9 @@ gsskrb5_acceptor_start
"\x02\x00", "\x02\x00",
GSS_KRB5_MECHANISM); GSS_KRB5_MECHANISM);
krb5_data_free (&outbuf); krb5_data_free (&outbuf);
if (ret) return ret; if (ret) {
return ret;
}
} else { } else {
output_token->length = outbuf.length; output_token->length = outbuf.length;
output_token->value = outbuf.data; output_token->value = outbuf.data;
@@ -479,8 +482,9 @@ gsskrb5_acceptor_start
ret = gssapi_lifetime_left(minor_status, ret = gssapi_lifetime_left(minor_status,
(*context_handle)->lifetime, (*context_handle)->lifetime,
time_rec); time_rec);
if (ret) if (ret) {
if (ret) return ret; return ret;
}
} }
/* /*
@@ -600,8 +604,9 @@ gsskrb5_acceptor_wait_for_dcestyle(
ret = gssapi_lifetime_left(minor_status, ret = gssapi_lifetime_left(minor_status,
(*context_handle)->lifetime, (*context_handle)->lifetime,
&lifetime_rec); &lifetime_rec);
if (ret) return ret; if (ret) {
return ret;
}
if (lifetime_rec == 0) { if (lifetime_rec == 0) {
return GSS_S_CONTEXT_EXPIRED; return GSS_S_CONTEXT_EXPIRED;
} }