From fc6f8be523de65bbcf0586d56bbccd27069ad852 Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Fri, 29 Oct 2010 11:03:26 +0200 Subject: s4:samr RPC server - DomainGeneralInformation - never return NULL on the oem name As far as I can tell Windows SAMR never returns NULL on unknown values in this call. --- source4/rpc_server/samr/dcesrv_samr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'source4/rpc_server/samr') diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c index 6871572ac1..71dca8217b 100644 --- a/source4/rpc_server/samr/dcesrv_samr.c +++ b/source4/rpc_server/samr/dcesrv_samr.c @@ -491,7 +491,9 @@ static NTSTATUS dcesrv_samr_info_DomGeneralInformation(struct samr_domain_state info->force_logoff_time = ldb_msg_find_attr_as_uint64(dom_msgs[0], "forceLogoff", 0x8000000000000000LL); - info->oem_information.string = ldb_msg_find_attr_as_string(dom_msgs[0], "oEMInformation", NULL); + info->oem_information.string = ldb_msg_find_attr_as_string(dom_msgs[0], + "oEMInformation", + ""); info->domain_name.string = state->domain_name; info->sequence_num = ldb_msg_find_attr_as_uint64(dom_msgs[0], "modifiedCount", @@ -554,7 +556,9 @@ static NTSTATUS dcesrv_samr_info_DomOEMInformation(struct samr_domain_state *sta struct ldb_message **dom_msgs, struct samr_DomOEMInformation *info) { - info->oem_information.string = ldb_msg_find_attr_as_string(dom_msgs[0], "oEMInformation", NULL); + info->oem_information.string = ldb_msg_find_attr_as_string(dom_msgs[0], + "oEMInformation", + ""); return NT_STATUS_OK; } -- cgit