sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-05 09:18:06 +03:00
Code

s4:rpc_server/netlogon: let CSDVersion="" wipe operatingSystemServicePack

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14936

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Jan 11 22:03:03 UTC 2022 on sn-devel-184

(cherry picked from commit 1243f52f7a)
This commit is contained in:
Stefan Metzmacher 2021-12-21 14:00:34 +01:00 committed by Jule Anger
parent 09832c6f95
commit 01e15dfaed
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
selftest/knownfail.d/samba4.rpc.netlogon
View File

@ -1,9 +0,0 @@
^samba4.rpc.netlogon.on.ncacn_np.with.seal,padcheck.netlogon.GetDomainInfo\(ad_dc_ntvfs\)
^samba4.rpc.netlogon.on.ncacn_ip_tcp.with.seal,padcheck.netlogon.GetDomainInfo\(ad_dc_ntvfs\)
^samba4.rpc.netlogon.on.ncacn_np.with.validate.netlogon.GetDomainInfo\(ad_dc_ntvfs\)
^samba4.rpc.netlogon.on.ncacn_ip_tcp.with.validate.netlogon.GetDomainInfo\(ad_dc_ntvfs\)
^samba4.rpc.netlogon.on.ncacn_np.with.bigendian.netlogon.GetDomainInfo\(ad_dc_ntvfs\)
^samba4.rpc.netlogon.on.ncacn_ip_tcp.with.bigendian.netlogon.GetDomainInfo\(ad_dc_ntvfs\)
^samba4.rpc.netlogon.with.seal,padcheck.netlogon.GetDomainInfo\(ad_dc\)
^samba4.rpc.netlogon.with.validate.netlogon.GetDomainInfo\(ad_dc\)
^samba4.rpc.netlogon.with.bigendian.netlogon.GetDomainInfo\(ad_dc\)

11
source4/rpc_server/netlogon/dcerpc_netlogon.c
View File

@ -2598,9 +2598,14 @@ static NTSTATUS dcesrv_netr_LogonGetDomainInfo(struct dcesrv_call_state *dce_cal
os_version->BuildNumber);
NT_STATUS_HAVE_NO_MEMORY(os_version_str);
ret = ldb_msg_add_string(new_msg,
"operatingSystemServicePack",
os_version->CSDVersion);
if (strlen(os_version->CSDVersion) != 0) {
ret = ldb_msg_add_string(new_msg,
"operatingSystemServicePack",
os_version->CSDVersion);
} else {
ret = samdb_msg_add_delete(sam_ctx, mem_ctx, new_msg,
"operatingSystemServicePack");
}
if (ret != LDB_SUCCESS) {
return NT_STATUS_NO_MEMORY;
}