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

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

diff --git a/selftest/knownfail.d/samba4.rpc.netlogon b/selftest/knownfail.d/samba4.rpc.netlogon
deleted file mode 100644 (file)
index 12d871e..0000000
--- a/selftest/knownfail.d/samba4.rpc.netlogon
+++ /dev/null
@@ -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\)

diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index 269bea7c6fc4facef6c64b096cdfa6169e79cfeb..cfd6d148b0a37430f27f2323ee6ca847f6375d4e 100644 (file)
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -2602,9 +2602,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;
                        }