spotted the mistake in group_info1 parsing.
authorLuke Leighton <lkcl@samba.org>
Wed, 2 Dec 1998 22:13:48 +0000 (22:13 +0000)
committerLuke Leighton <lkcl@samba.org>
Wed, 2 Dec 1998 22:13:48 +0000 (22:13 +0000)
(This used to be commit e39c0c76ae52bbd4539f8f254e78566a5511efc1)

source3/include/rpc_samr.h
source3/rpc_parse/parse_samr.c

index 657058d9407271ecea5301e561fea4862f4ee1f9..1fd48f8020989827b944810ca0db5805744e0f33 100644 (file)
@@ -732,11 +732,12 @@ typedef struct q_samr_query_group_info
 typedef struct samr_group_info1
 {
        UNIHDR hdr_acct_name;
-       UNIHDR hdr_acct_desc;
 
        uint32 unknown_1; /* 0x0000 0003 - number of group members? */
        uint32 unknown_2; /* 0x0000 0001 - number of group members? */
 
+       UNIHDR hdr_acct_desc;
+
        UNISTR2 uni_acct_name;
        UNISTR2 uni_acct_desc;
 
index 5a9b7660ab93c48335c7069e2f3b019c2f9765d5..e1f4d01d9bf726c6c7d6b125e164429de8fc1a4e 100644 (file)
@@ -1384,11 +1384,12 @@ void make_samr_group_info1(GROUP_INFO1 *gr1,
        DEBUG(5,("make_samr_group_info1\n"));
 
        make_uni_hdr(&(gr1->hdr_acct_name), acct_len , acct_len, acct_name ? 1 : 0);
-       make_uni_hdr(&(gr1->hdr_acct_desc), desc_len , desc_len, acct_desc ? 1 : 0);
 
        gr1->unknown_1 = 0x3;
        gr1->unknown_2 = 0x3;
 
+       make_uni_hdr(&(gr1->hdr_acct_desc), desc_len , desc_len, acct_desc ? 1 : 0);
+
        make_unistr2(&(gr1->uni_acct_name), acct_name, acct_len);
        make_unistr2(&(gr1->uni_acct_desc), acct_desc, desc_len);
 }
@@ -1407,11 +1408,12 @@ void samr_io_group_info1(char *desc,  GROUP_INFO1 *gr1, prs_struct *ps, int dept
        prs_align(ps);
 
        smb_io_unihdr ("hdr_acct_name", &(gr1->hdr_acct_name) , ps, depth); 
-       smb_io_unihdr ("hdr_acct_desc", &(gr1->hdr_acct_desc) , ps, depth); 
 
        prs_uint32("unknown_1", ps, depth, &(gr1->unknown_1));
        prs_uint32("unknown_2", ps, depth, &(gr1->unknown_2));
 
+       smb_io_unihdr ("hdr_acct_desc", &(gr1->hdr_acct_desc) , ps, depth); 
+
        smb_io_unistr2("uni_acct_name", &(gr1->uni_acct_name), gr1->hdr_acct_name.buffer, ps, depth);
        prs_align(ps);