diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-06-03 15:11:42 -0700 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-06-03 15:11:42 -0700 |
| commit | 70219bee139445ab6116def04e25c245871f8391 (patch) | |
| tree | 5bd69a8fe4e664ca5abfeaed1ce2983ebb5f48ca /source4/heimdal/lib/gssapi/krb5/init_sec_context.c | |
| parent | 7c926ff1150133127c73b9b46d82524f57b3c616 (diff) | |
| parent | 446748bfe1f06d0900e44fe8acafdf856d54486e (diff) | |
| download | samba-70219bee139445ab6116def04e25c245871f8391.tar.gz samba-70219bee139445ab6116def04e25c245871f8391.tar.bz2 samba-70219bee139445ab6116def04e25c245871f8391.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 9d74201e462f2f95ed5bd91200681db3bd2a9277)
Diffstat (limited to 'source4/heimdal/lib/gssapi/krb5/init_sec_context.c')
| -rw-r--r-- | source4/heimdal/lib/gssapi/krb5/init_sec_context.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/source4/heimdal/lib/gssapi/krb5/init_sec_context.c b/source4/heimdal/lib/gssapi/krb5/init_sec_context.c index d4482a54b2..ab7624eef0 100644 --- a/source4/heimdal/lib/gssapi/krb5/init_sec_context.c +++ b/source4/heimdal/lib/gssapi/krb5/init_sec_context.c @@ -540,12 +540,18 @@ init_auth goto failure; } - ret = _gsskrb5_encapsulate (minor_status, &outbuf, output_token, - (u_char *)"\x01\x00", GSS_KRB5_MECHANISM); - if (ret) - goto failure; + if (flags & GSS_C_DCE_STYLE) { + output_token->value = outbuf.data; + output_token->length = outbuf.length; + } else { + ret = _gsskrb5_encapsulate (minor_status, &outbuf, output_token, + (u_char *)"\x01\x00", GSS_KRB5_MECHANISM); + if (ret) + goto failure; + + krb5_data_free (&outbuf); + } - krb5_data_free (&outbuf); krb5_free_creds(context, kcred); free_Checksum(&cksum); if (cred == NULL) |