[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-1985-g58f6618

[Stefan Metzmacher]

The branch, v4-0-test has been updated
       via  58f66184f0f732a78e86bbb0f3c29e920f086d08 (commit)
      from  00ad3f8a6dfb742113c1eeedb4c9a81b0a64947e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 58f66184f0f732a78e86bbb0f3c29e920f086d08
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jun 2 16:27:44 2008 +0200

    krb5_init_sec_context: skip the token header when GSS_C_DCE_STYLE is specified
    
    Windows (and heimdal) accepts packets with token header
    in the server, but it doesn't match the windows client.
    We now match the windows client and that fixes
    also the display in wireshark.
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source/heimdal/lib/gssapi/krb5/init_sec_context.c |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/heimdal/lib/gssapi/krb5/init_sec_context.c b/source/heimdal/lib/gssapi/krb5/init_sec_context.c
index d4482a5..ab7624e 100644
--- a/source/heimdal/lib/gssapi/krb5/init_sec_context.c
+++ b/source/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)


-- 
Samba Shared Repository