Author: vlendec Date: 2004-12-15 13:13:31 +0000 (Wed, 15 Dec 2004) New Revision: 4220
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4220 Log: Fix samba3 samr "idl"... According to samba4 idl samr_DomInfo2 contains a comment string and not an unknown 12 byte structure... Found after abartlet's smbtorture extended this string to "Tortured by Samba4: Fri Nov 26 15:40:18 2004 CET" ;-)) Volker Modified: trunk/source/include/rpc_samr.h trunk/source/rpc_parse/parse_samr.c trunk/source/rpc_server/srv_samr_nt.c Changeset: Modified: trunk/source/include/rpc_samr.h =================================================================== --- trunk/source/include/rpc_samr.h 2004-12-15 13:13:15 UTC (rev 4219) +++ trunk/source/include/rpc_samr.h 2004-12-15 13:13:31 UTC (rev 4220) @@ -556,9 +556,7 @@ { uint32 unknown_0; /* 0x0000 0000 */ uint32 unknown_1; /* 0x8000 0000 */ - uint32 unknown_2; /* 0x0000 0000 */ - - uint32 ptr_0; /* pointer to unknown structure */ + UNIHDR hdr_comment; /* comment according to samba4 idl */ UNIHDR hdr_domain; /* domain name unicode header */ UNIHDR hdr_server; /* server name unicode header */ @@ -578,6 +576,7 @@ uint8 padding[12]; /* 12 bytes zeros */ + UNISTR2 uni_comment; /* comment unicode string */ UNISTR2 uni_domain; /* domain name unicode string */ UNISTR2 uni_server; /* server name unicode string */ Modified: trunk/source/rpc_parse/parse_samr.c =================================================================== --- trunk/source/rpc_parse/parse_samr.c 2004-12-15 13:13:15 UTC (rev 4219) +++ trunk/source/rpc_parse/parse_samr.c 2004-12-15 13:13:31 UTC (rev 4220) @@ -662,15 +662,12 @@ ********************************************************************/ void init_unk_info2(SAM_UNK_INFO_2 * u_2, - const char *domain, const char *server, + const char *comment, const char *domain, const char *server, uint32 seq_num, uint32 num_users, uint32 num_groups, uint32 num_alias) { u_2->unknown_0 = 0x00000000; u_2->unknown_1 = 0x80000000; - u_2->unknown_2 = 0x00000000; - u_2->ptr_0 = 1; - u_2->seq_num = seq_num; u_2->unknown_3 = 0x00000000; @@ -683,6 +680,8 @@ memset(u_2->padding, 0, sizeof(u_2->padding)); /* 12 bytes zeros */ + init_unistr2(&u_2->uni_comment, comment, UNI_FLAGS_NONE); + init_uni_hdr(&u_2->hdr_comment, &u_2->uni_comment); init_unistr2(&u_2->uni_domain, domain, UNI_FLAGS_NONE); init_uni_hdr(&u_2->hdr_domain, &u_2->uni_domain); init_unistr2(&u_2->uni_server, server, UNI_FLAGS_NONE); @@ -706,11 +705,8 @@ return False; if(!prs_uint32("unknown_1", ps, depth, &u_2->unknown_1)) /* 0x8000 0000 */ return False; - if(!prs_uint32("unknown_2", ps, depth, &u_2->unknown_2)) /* 0x0000 0000 */ + if(!smb_io_unihdr("hdr_comment", &u_2->hdr_comment, ps, depth)) return False; - - if(!prs_uint32("ptr_0", ps, depth, &u_2->ptr_0)) - return False; if(!smb_io_unihdr("hdr_domain", &u_2->hdr_domain, ps, depth)) return False; if(!smb_io_unihdr("hdr_server", &u_2->hdr_server, ps, depth)) @@ -738,15 +734,8 @@ if(!prs_uint32("num_local_grps", ps, depth, &u_2->num_local_grps)) return False; - if (u_2->ptr_0) { - /* this was originally marked as 'padding'. It isn't - padding, it is some sort of optional 12 byte - structure. When it is present it contains zeros - !? */ - if(!prs_uint8s(False, "unknown", ps, depth, u_2->padding,sizeof(u_2->padding))) - return False; - } - + if(!smb_io_unistr2("uni_comment", &u_2->uni_comment, u_2->hdr_comment.buffer, ps, depth)) + return False; if(!smb_io_unistr2("uni_domain", &u_2->uni_domain, u_2->hdr_domain.buffer, ps, depth)) return False; if(!smb_io_unistr2("uni_server", &u_2->uni_server, u_2->hdr_server.buffer, ps, depth)) Modified: trunk/source/rpc_server/srv_samr_nt.c =================================================================== --- trunk/source/rpc_server/srv_samr_nt.c 2004-12-15 13:13:15 UTC (rev 4219) +++ trunk/source/rpc_server/srv_samr_nt.c 2004-12-15 13:13:31 UTC (rev 4220) @@ -2138,7 +2138,7 @@ free_samr_db(info); /* The time call below is to get a sequence number for the sam. FIXME !!! JRA. */ - init_unk_info2(&ctr->info.inf2, lp_workgroup(), global_myname(), (uint32) time(NULL), + init_unk_info2(&ctr->info.inf2, "", lp_workgroup(), global_myname(), (uint32) time(NULL), num_users, num_groups, num_aliases); break; case 0x03:
