s4:samr RPC server - DomainGeneralInformation - never return NULL on the oem name
authorMatthias Dieter Wallnöfer <mdw@samba.org>
Fri, 29 Oct 2010 09:03:26 +0000 (11:03 +0200)
committerMatthias Dieter Wallnöfer <mdw@samba.org>
Fri, 29 Oct 2010 09:55:18 +0000 (09:55 +0000)
As far as I can tell Windows SAMR never returns NULL on unknown values in this
call.

source4/rpc_server/samr/dcesrv_samr.c

index 6871572ac1d8104ae53884a2f76d8789205cfbc3..71dca8217b10449728454d90f79fea03ea5276ca 100644 (file)
@@ -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;
 }