[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-1225-g0c1ccbc

[Günther Deschner]

The branch, v4-0-test has been updated
       via  0c1ccbc183c1d2967da2d9a17033f3b116ff7387 (commit)
       via  ad19da7f83761948f379921560da34bb6a01e625 (commit)
       via  ef0971206cda598e6bfad2ff06a3d2e9e8131682 (commit)
      from  d0b641a9ee36939468beb427bf6b15892342a33d (commit)

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


- Log -----------------------------------------------------------------
commit 0c1ccbc183c1d2967da2d9a17033f3b116ff7387
Author: Günther Deschner <gd at samba.org>
Date:   Thu Mar 6 16:41:24 2008 +0100

    Ignore Kerberos PAC type 12.
    
    Until we worked out the PAC_TYPE_UNKNOWN_12 format (or received documentation)
    ignore it so that the PAC parsing can proceed.
    
    Guenther
    (cherry picked from commit 3630ec26c99fdea46c47117d026f9bffb2c4590a)

commit ad19da7f83761948f379921560da34bb6a01e625
Author: Günther Deschner <gd at samba.org>
Date:   Thu Mar 6 14:15:07 2008 +0100

    Slowly making progress on PAC_UNKNOWN_12.
    
    unknown1 and unknown2 are offset headers for the strings.
    
    Guenther
    (cherry picked from commit 7af70e75b9abf92921f33ec4207ad486ee2493d6)

commit ef0971206cda598e6bfad2ff06a3d2e9e8131682
Author: Günther Deschner <gd at samba.org>
Date:   Tue Mar 4 12:26:05 2008 +0100

    Add new Windows 2008 Kerberos PAC Type 12 (apparently again undocumented).
    
    We need at least to parse this in order to correctly support kerberized session
    setup from w2k8 as well as local pam_winbind logons using kerberos.
    
    Guenther
    (cherry picked from commit 4ba62d49d740c43cf17ceef1534cf1c8a7e4a130)

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

Summary of changes:
 source/librpc/idl/krb5pac.idl |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/librpc/idl/krb5pac.idl b/source/librpc/idl/krb5pac.idl
index efd4aa8..3505fc8 100644
--- a/source/librpc/idl/krb5pac.idl
+++ b/source/librpc/idl/krb5pac.idl
@@ -31,6 +31,19 @@ interface krb5pac
 		samr_RidWithAttributeArray res_groups;
     	} PAC_LOGON_INFO;
 
+	typedef struct {
+		[value(2*strlen_m(upn_name))] uint16 upn_size;
+		uint16 upn_offset;
+		[value(2*strlen_m(domain_name))] uint16 domain_size;
+		uint16 domain_offset;
+		uint16 unknown3; /* 0x01 */
+		uint16 unknown4;
+		uint32 unknown5;
+		[charset(UTF16)] uint8 upn_name[upn_size+2];
+		[charset(UTF16)] uint8 domain_name[domain_size+2];
+		uint32 unknown6; /* padding */
+	} PAC_UNKNOWN_12;
+
 	typedef [public] struct {
 		[value(0x00081001)] uint32 unknown1;
 		[value(0xCCCCCCCC)] uint32 unknown2;
@@ -44,14 +57,21 @@ interface krb5pac
 		PAC_TYPE_SRV_CHECKSUM = 6,
 		PAC_TYPE_KDC_CHECKSUM = 7,
 		PAC_TYPE_LOGON_NAME = 10,
-		PAC_TYPE_CONSTRAINED_DELEGATION = 11
+		PAC_TYPE_CONSTRAINED_DELEGATION = 11,
+		PAC_TYPE_UNKNOWN_12 = 12
 	} PAC_TYPE;
 
+	typedef struct {
+		[flag(NDR_REMAINING)] DATA_BLOB remaining;
+	} DATA_BLOB_REM;
+
 	typedef [public,nodiscriminant,gensize] union {
 		[case(PAC_TYPE_LOGON_INFO)]	PAC_LOGON_INFO_CTR logon_info;
 		[case(PAC_TYPE_SRV_CHECKSUM)]	PAC_SIGNATURE_DATA srv_cksum;
 		[case(PAC_TYPE_KDC_CHECKSUM)]	PAC_SIGNATURE_DATA kdc_cksum;
 		[case(PAC_TYPE_LOGON_NAME)]	PAC_LOGON_NAME logon_name;
+		[case(PAC_TYPE_UNKNOWN_12)]	[subcontext(0)] DATA_BLOB_REM unknown;
+		/* [case(PAC_TYPE_UNKNOWN_12)]	PAC_UNKNOWN_12 unknown; */
 	} PAC_INFO;
 
 	typedef [public,nopush,nopull,noprint] struct {
@@ -67,10 +87,6 @@ interface krb5pac
 		PAC_BUFFER buffers[num_buffers];
 	} PAC_DATA;
 
-	typedef struct {
-		[flag(NDR_REMAINING)] DATA_BLOB remaining;
-	} DATA_BLOB_REM;
-
 	typedef [public] struct {
 		PAC_TYPE type;
 		uint32 ndr_size;


-- 
Samba Shared Repository