Merge of uninitialised variable fix from APPLIANCE_HEAD.

(This used to be commit 20a7fefee8c85f02f6a0e2a02c0df04a8b22b7cb)

diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c
index e80175f71db8c7854a91ee665d20848ab958fa14..fd39f87e7962fb4bab5daf1bdf26522c2c224ff1 100644 (file)
--- a/source3/rpc_server/srv_samr.c
+++ b/source3/rpc_server/srv_samr.c
@@ -735,8 +735,7 @@ static BOOL samr_reply_enum_dom_aliases(SAMR_Q_ENUM_DOM_ALIASES *q_u,
        fstring sam_sid_str;
        struct group *grp;
 
-       r_e.status = 0x0;
-       r_e.num_entries = 0;
+       ZERO_STRUCT(r_e);
 
        /* find the policy handle.  open a policy on it. */
        if (r_e.status == 0x0 && !get_lsa_policy_samr_sid(&q_u->pol, &sid))
@@ -840,8 +839,6 @@ static BOOL samr_reply_query_dispinfo(SAMR_Q_QUERY_DISPINFO *q_u, prs_struct *rd
 
        ZERO_STRUCT(r_e);
 
-       r_e.status = 0x0;
-
        DEBUG(5,("samr_reply_query_dispinfo: %d\n", __LINE__));
 
        /* find the policy handle.  open a policy on it. */