Merge from 3_0:

In cli_lsa_lookup_sids don't leave the domain field uninitialized if
some sid could not be mapped. Otherwise this call is unnecessarily
complicated to call.

Volker
(This used to be commit 198b01fc54ce7a5beeddc680b30da291639b4eda)

diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index 65115419b47a32664e16d70e28f2c267af809d6c..ab4fbad6131357c30cdcd33b8acaf2081529fdbc 100644 (file)
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -322,6 +322,7 @@ NTSTATUS cli_lsa_lookup_sids(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 
                } else {
                        (*names)[i] = NULL;
+                       (*domains)[i] = NULL;
                        (*types)[i] = SID_NAME_UNKNOWN;
                }
        }