Merge from HEAD - always initailise this to zero - helps callers in loops.

(This used to be commit f200a5b85832ac5ec7724d58da7270cd14c565e3)

diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index 9d0b48796c0b88f19db60f4a4ed050051581435d..fa4c662e04524b4c42608f906ea7bb5c29d3c082 100644 (file)
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -571,6 +571,9 @@ NTSTATUS cli_samr_enum_dom_users(struct cli_state *cli, TALLOC_CTX *mem_ctx,
        ZERO_STRUCT(q);
        ZERO_STRUCT(r);
        
+       /* always init this */
+       *num_dom_users = 0;
+       
        /* Initialise parse structures */
 
        prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);