Author: gd Date: 2006-05-04 17:28:05 +0000 (Thu, 04 May 2006) New Revision: 15438
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15438 Log: Fix samrQueryDomainInfo level 5 where we returned our netbios name eversince instead of the domain name when we are a DC. Yes, there are applications relying on this call to be correct. Guenther Modified: branches/SAMBA_3_0/source/include/rpc_samr.h branches/SAMBA_3_0/source/rpc_parse/parse_samr.c branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c trunk/source/include/rpc_samr.h trunk/source/rpc_parse/parse_samr.c trunk/source/rpc_server/srv_samr_nt.c Changeset: Modified: branches/SAMBA_3_0/source/include/rpc_samr.h =================================================================== --- branches/SAMBA_3_0/source/include/rpc_samr.h 2006-05-04 16:04:08 UTC (rev 15437) +++ branches/SAMBA_3_0/source/include/rpc_samr.h 2006-05-04 17:28:05 UTC (rev 15438) @@ -572,8 +572,8 @@ typedef struct sam_unknown_info_5_inf { - UNIHDR hdr_server; /* server name unicode header */ - UNISTR2 uni_server; /* server name unicode string */ + UNIHDR hdr_domain; /* domain name unicode header */ + UNISTR2 uni_domain; /* domain name unicode string */ } SAM_UNK_INFO_5; Modified: branches/SAMBA_3_0/source/rpc_parse/parse_samr.c =================================================================== --- branches/SAMBA_3_0/source/rpc_parse/parse_samr.c 2006-05-04 16:04:08 UTC (rev 15437) +++ branches/SAMBA_3_0/source/rpc_parse/parse_samr.c 2006-05-04 17:28:05 UTC (rev 15438) @@ -662,10 +662,10 @@ inits a structure. ********************************************************************/ -void init_unk_info5(SAM_UNK_INFO_5 * u_5,const char *server) +void init_unk_info5(SAM_UNK_INFO_5 * u_5,const char *domain) { - init_unistr2(&u_5->uni_server, server, UNI_FLAGS_NONE); - init_uni_hdr(&u_5->hdr_server, &u_5->uni_server); + init_unistr2(&u_5->uni_domain, domain, UNI_FLAGS_NONE); + init_uni_hdr(&u_5->hdr_domain, &u_5->uni_domain); } /******************************************************************* @@ -681,10 +681,10 @@ prs_debug(ps, depth, desc, "sam_io_unk_info5"); depth++; - if(!smb_io_unihdr("hdr_server", &u_5->hdr_server, ps, depth)) + if(!smb_io_unihdr("hdr_domain", &u_5->hdr_domain, ps, depth)) return False; - if(!smb_io_unistr2("uni_server", &u_5->uni_server, u_5->hdr_server.buffer, ps, depth)) + if(!smb_io_unistr2("uni_domain", &u_5->uni_domain, u_5->hdr_domain.buffer, ps, depth)) return False; return True; Modified: branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c =================================================================== --- branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c 2006-05-04 16:04:08 UTC (rev 15437) +++ branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c 2006-05-04 17:28:05 UTC (rev 15438) @@ -2301,7 +2301,7 @@ init_unk_info3(&ctr->info.inf3, nt_logout); break; case 0x05: - init_unk_info5(&ctr->info.inf5, global_myname()); + init_unk_info5(&ctr->info.inf5, get_global_sam_name()); break; case 0x06: init_unk_info6(&ctr->info.inf6); @@ -4802,7 +4802,7 @@ init_unk_info3(&ctr->info.inf3, nt_logout); break; case 0x05: - init_unk_info5(&ctr->info.inf5, global_myname()); + init_unk_info5(&ctr->info.inf5, get_global_sam_name()); break; case 0x06: init_unk_info6(&ctr->info.inf6); Modified: trunk/source/include/rpc_samr.h =================================================================== --- trunk/source/include/rpc_samr.h 2006-05-04 16:04:08 UTC (rev 15437) +++ trunk/source/include/rpc_samr.h 2006-05-04 17:28:05 UTC (rev 15438) @@ -572,8 +572,8 @@ typedef struct sam_unknown_info_5_inf { - UNIHDR hdr_server; /* server name unicode header */ - UNISTR2 uni_server; /* server name unicode string */ + UNIHDR hdr_domain; /* domain name unicode header */ + UNISTR2 uni_domain; /* domain name unicode string */ } SAM_UNK_INFO_5; Modified: trunk/source/rpc_parse/parse_samr.c =================================================================== --- trunk/source/rpc_parse/parse_samr.c 2006-05-04 16:04:08 UTC (rev 15437) +++ trunk/source/rpc_parse/parse_samr.c 2006-05-04 17:28:05 UTC (rev 15438) @@ -662,10 +662,10 @@ inits a structure. ********************************************************************/ -void init_unk_info5(SAM_UNK_INFO_5 * u_5,const char *server) +void init_unk_info5(SAM_UNK_INFO_5 * u_5,const char *domain) { - init_unistr2(&u_5->uni_server, server, UNI_FLAGS_NONE); - init_uni_hdr(&u_5->hdr_server, &u_5->uni_server); + init_unistr2(&u_5->uni_domain, domain, UNI_FLAGS_NONE); + init_uni_hdr(&u_5->hdr_domain, &u_5->uni_domain); } /******************************************************************* @@ -681,10 +681,10 @@ prs_debug(ps, depth, desc, "sam_io_unk_info5"); depth++; - if(!smb_io_unihdr("hdr_server", &u_5->hdr_server, ps, depth)) + if(!smb_io_unihdr("hdr_domain", &u_5->hdr_domain, ps, depth)) return False; - if(!smb_io_unistr2("uni_server", &u_5->uni_server, u_5->hdr_server.buffer, ps, depth)) + if(!smb_io_unistr2("uni_domain", &u_5->uni_domain, u_5->hdr_domain.buffer, ps, depth)) return False; return True; Modified: trunk/source/rpc_server/srv_samr_nt.c =================================================================== --- trunk/source/rpc_server/srv_samr_nt.c 2006-05-04 16:04:08 UTC (rev 15437) +++ trunk/source/rpc_server/srv_samr_nt.c 2006-05-04 17:28:05 UTC (rev 15438) @@ -2301,7 +2301,7 @@ init_unk_info3(&ctr->info.inf3, nt_logout); break; case 0x05: - init_unk_info5(&ctr->info.inf5, global_myname()); + init_unk_info5(&ctr->info.inf5, get_global_sam_name()); break; case 0x06: init_unk_info6(&ctr->info.inf6); @@ -4802,7 +4802,7 @@ init_unk_info3(&ctr->info.inf3, nt_logout); break; case 0x05: - init_unk_info5(&ctr->info.inf5, global_myname()); + init_unk_info5(&ctr->info.inf5, get_global_sam_name()); break; case 0x06: init_unk_info6(&ctr->info.inf6);
