svn commit: lorikeet r467 - in trunk/heimdal/lib/gssapi: .
abartlet at samba.org
abartlet at samba.org
Sat Sep 10 21:41:45 GMT 2005
Author: abartlet
Date: 2005-09-10 21:41:44 +0000 (Sat, 10 Sep 2005)
New Revision: 467
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=467
Log:
Merge from Samba4, fix silly stuff from previous merge.
Andrew Bartlett
Modified:
trunk/heimdal/lib/gssapi/accept_sec_context.c
Changeset:
Modified: trunk/heimdal/lib/gssapi/accept_sec_context.c
===================================================================
--- trunk/heimdal/lib/gssapi/accept_sec_context.c 2005-09-08 12:55:48 UTC (rev 466)
+++ trunk/heimdal/lib/gssapi/accept_sec_context.c 2005-09-10 21:41:44 UTC (rev 467)
@@ -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;
}
More information about the samba-cvs
mailing list