The branch, v3-2-test has been updated
       via  9ccda75b376b559f81ed11e729bc11a1c83f6861 (commit)
       via  7af70e75b9abf92921f33ec4207ad486ee2493d6 (commit)
      from  1bcfef6a9093aa873550a263dc142c8a3f5edffd (commit)

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


- Log -----------------------------------------------------------------
commit 9ccda75b376b559f81ed11e729bc11a1c83f6861
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Thu Mar 6 14:47:21 2008 +0100

    Re-run make idl.
    
    Guenther

commit 7af70e75b9abf92921f33ec4207ad486ee2493d6
Author: Günther Deschner <[EMAIL PROTECTED]>
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

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

Summary of changes:
 source/librpc/gen_ndr/krb5pac.h     |    4 ++--
 source/librpc/gen_ndr/ndr_krb5pac.c |   12 ++++++------
 source/librpc/idl/krb5pac.idl       |    6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/librpc/gen_ndr/krb5pac.h b/source/librpc/gen_ndr/krb5pac.h
index 8a14825..b35758d 100644
--- a/source/librpc/gen_ndr/krb5pac.h
+++ b/source/librpc/gen_ndr/krb5pac.h
@@ -27,9 +27,9 @@ struct PAC_LOGON_INFO {
 
 struct PAC_UNKNOWN_12 {
        uint16_t upn_size;/* [value(2*strlen_m(upn_name))] */
-       uint16_t unknown1;
+       uint16_t upn_offset;
        uint16_t domain_size;/* [value(2*strlen_m(domain_name))] */
-       uint16_t unknown2;
+       uint16_t domain_offset;
        uint16_t unknown3;
        uint16_t unknown4;
        uint32_t unknown5;
diff --git a/source/librpc/gen_ndr/ndr_krb5pac.c 
b/source/librpc/gen_ndr/ndr_krb5pac.c
index be9e2e1..881d542 100644
--- a/source/librpc/gen_ndr/ndr_krb5pac.c
+++ b/source/librpc/gen_ndr/ndr_krb5pac.c
@@ -171,9 +171,9 @@ static enum ndr_err_code ndr_push_PAC_UNKNOWN_12(struct 
ndr_push *ndr, int ndr_f
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_push_align(ndr, 4));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, 2 * 
strlen_m(r->upn_name)));
-               NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->unknown1));
+               NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->upn_offset));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, 2 * 
strlen_m(r->domain_name)));
-               NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->unknown2));
+               NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->domain_offset));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->unknown3));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->unknown4));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->unknown5));
@@ -191,9 +191,9 @@ static enum ndr_err_code ndr_pull_PAC_UNKNOWN_12(struct 
ndr_pull *ndr, int ndr_f
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->upn_size));
-               NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->unknown1));
+               NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->upn_offset));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->domain_size));
-               NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->unknown2));
+               NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->domain_offset));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->unknown3));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->unknown4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->unknown5));
@@ -211,9 +211,9 @@ _PUBLIC_ void ndr_print_PAC_UNKNOWN_12(struct ndr_print 
*ndr, const char *name,
        ndr_print_struct(ndr, name, "PAC_UNKNOWN_12");
        ndr->depth++;
        ndr_print_uint16(ndr, "upn_size", (ndr->flags & 
LIBNDR_PRINT_SET_VALUES)?2 * strlen_m(r->upn_name):r->upn_size);
-       ndr_print_uint16(ndr, "unknown1", r->unknown1);
+       ndr_print_uint16(ndr, "upn_offset", r->upn_offset);
        ndr_print_uint16(ndr, "domain_size", (ndr->flags & 
LIBNDR_PRINT_SET_VALUES)?2 * strlen_m(r->domain_name):r->domain_size);
-       ndr_print_uint16(ndr, "unknown2", r->unknown2);
+       ndr_print_uint16(ndr, "domain_offset", r->domain_offset);
        ndr_print_uint16(ndr, "unknown3", r->unknown3);
        ndr_print_uint16(ndr, "unknown4", r->unknown4);
        ndr_print_uint32(ndr, "unknown5", r->unknown5);
diff --git a/source/librpc/idl/krb5pac.idl b/source/librpc/idl/krb5pac.idl
index 11f08e1..6bc8485 100644
--- a/source/librpc/idl/krb5pac.idl
+++ b/source/librpc/idl/krb5pac.idl
@@ -33,15 +33,15 @@ interface krb5pac
 
        typedef struct {
                [value(2*strlen_m(upn_name))] uint16 upn_size;
-               uint16 unknown1; /* 0x10 */
+               uint16 upn_offset;
                [value(2*strlen_m(domain_name))] uint16 domain_size;
-               uint16 unknown2; /* 0x50 */
+               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;
+               uint32 unknown6; /* padding */
        } PAC_UNKNOWN_12;
 
        typedef [public] struct {


-- 
Samba Shared Repository

Reply via email to