summaryrefslogtreecommitdiffstats
path: root/source3
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-08-21 09:44:30 +0000
committerAndrew Tridgell <tridge@samba.org>1998-08-21 09:44:30 +0000
commit57f1129cdc154c56ae70287999c5961e072b4975 (patch)
tree8c8271b85e4d5dad0914b315656f252d2f749a5f /source3
parent7d657984bbdf867319e96dee6fbf5ed5b835ad14 (diff)
downloadsamba-57f1129cdc154c56ae70287999c5961e072b4975.tar.gz
samba-57f1129cdc154c56ae70287999c5961e072b4975.tar.xz
samba-57f1129cdc154c56ae70287999c5961e072b4975.zip
use ZERO_STRUCT() to initialise lots of structures.
Luke, you need to do something similar in the rest of the rpc code. Have fun! (This used to be commit bdd8aaa544780898e20189195d4019b9beb4445c)
Diffstat (limited to 'source3')
-rw-r--r--source3/lsarpcd/srv_lsa.c31
-rw-r--r--source3/rpc_server/srv_lsa.c31
2 files changed, 60 insertions, 2 deletions
diff --git a/source3/lsarpcd/srv_lsa.c b/source3/lsarpcd/srv_lsa.c
index 43f463a8ab6..da0c11ea7bf 100644
--- a/source3/lsarpcd/srv_lsa.c
+++ b/source3/lsarpcd/srv_lsa.c
@@ -38,8 +38,10 @@ static void lsa_reply_open_policy(prs_struct *rdata)
int i;
LSA_R_OPEN_POL r_o;
+ ZERO_STRUCT(r_o);
+
/* set up the LSA QUERY INFO response */
- bzero(r_o.pol.data, POL_HND_SIZE);
+
for (i = 4; i < POL_HND_SIZE; i++)
{
r_o.pol.data[i] = i;
@@ -78,6 +80,8 @@ static void lsa_reply_enum_trust_dom(LSA_Q_ENUM_TRUST_DOM *q_e,
{
LSA_R_ENUM_TRUST_DOM r_e;
+ ZERO_STRUCT(r_e);
+
/* set up the LSA QUERY INFO response */
make_r_enum_trust_dom(&r_e, enum_context, dom_name, dom_sid,
dom_name != NULL ? 0x0 : 0x80000000 | NT_STATUS_UNABLE_TO_FREE_VM);
@@ -94,6 +98,8 @@ static void lsa_reply_query_info(LSA_Q_QUERY_INFO *q_q, prs_struct *rdata,
{
LSA_R_QUERY_INFO r_q;
+ ZERO_STRUCT(r_q);
+
/* set up the LSA QUERY INFO response */
r_q.undoc_buffer = 0x22000000; /* bizarre */
@@ -237,6 +243,10 @@ static void lsa_reply_lookup_sids(prs_struct *rdata,
LSA_TRANS_NAME_ENUM names;
uint32 mapped_count = 0;
+ ZERO_STRUCT(r_l);
+ ZERO_STRUCT(ref);
+ ZERO_STRUCT(names);
+
/* set up the LSA Lookup SIDs response */
make_dom_ref(&ref, dom_name, dom_sid, other_sid1, other_sid2, other_sid3);
make_lsa_trans_names(&names, num_entries, sid, &mapped_count);
@@ -256,6 +266,8 @@ static void lsa_reply_lookup_rids(prs_struct *rdata,
{
LSA_R_LOOKUP_RIDS r_l;
+ ZERO_STRUCT(r_l);
+
/* set up the LSA Lookup RIDs response */
make_reply_lookup_rids(&r_l, num_entries, dom_rids,
dom_name, dom_sid, other_sid1, other_sid2, other_sid3);
@@ -273,6 +285,8 @@ static void api_lsa_open_policy( int uid, prs_struct *data,
{
LSA_Q_OPEN_POL q_o;
+ ZERO_STRUCT(q_o);
+
/* grab the server, object attributes and desired access flag...*/
lsa_io_q_open_pol("", &q_o, data, 0);
@@ -290,6 +304,8 @@ static void api_lsa_enum_trust_dom( int uid, prs_struct *data,
{
LSA_Q_ENUM_TRUST_DOM q_e;
+ ZERO_STRUCT(q_e);
+
/* grab the enum trust domain context etc. */
lsa_io_q_enum_trust_dom("", &q_e, data, 0);
@@ -307,6 +323,8 @@ static void api_lsa_query_info( int uid, prs_struct *data,
LSA_Q_QUERY_INFO q_i;
pstring dom_name;
+ ZERO_STRUCT(q_i);
+
/* grab the info class and policy handle */
lsa_io_q_query("", &q_i, data, 0);
@@ -328,6 +346,11 @@ static void api_lsa_lookup_sids( int uid, prs_struct *data,
DOM_SID sid_S_1_3;
DOM_SID sid_S_1_5;
+ ZERO_STRUCT(q_l);
+ ZERO_STRUCT(sid_S_1_1);
+ ZERO_STRUCT(sid_S_1_3);
+ ZERO_STRUCT(sid_S_1_5);
+
/* grab the info class and policy handle */
lsa_io_q_lookup_sids("", &q_l, data, 0);
@@ -359,6 +382,12 @@ static void api_lsa_lookup_names( int uid, prs_struct *data,
uint32 dom_rids[MAX_LOOKUP_SIDS];
uint32 dummy_g_rid;
+ ZERO_STRUCT(q_l);
+ ZERO_STRUCT(sid_S_1_1);
+ ZERO_STRUCT(sid_S_1_3);
+ ZERO_STRUCT(sid_S_1_5);
+ ZERO_STRUCT(dom_rids);
+
/* grab the info class and policy handle */
lsa_io_q_lookup_rids("", &q_l, data, 0);
diff --git a/source3/rpc_server/srv_lsa.c b/source3/rpc_server/srv_lsa.c
index 43f463a8ab6..da0c11ea7bf 100644
--- a/source3/rpc_server/srv_lsa.c
+++ b/source3/rpc_server/srv_lsa.c
@@ -38,8 +38,10 @@ static void lsa_reply_open_policy(prs_struct *rdata)
int i;
LSA_R_OPEN_POL r_o;
+ ZERO_STRUCT(r_o);
+
/* set up the LSA QUERY INFO response */
- bzero(r_o.pol.data, POL_HND_SIZE);
+
for (i = 4; i < POL_HND_SIZE; i++)
{
r_o.pol.data[i] = i;
@@ -78,6 +80,8 @@ static void lsa_reply_enum_trust_dom(LSA_Q_ENUM_TRUST_DOM *q_e,
{
LSA_R_ENUM_TRUST_DOM r_e;
+ ZERO_STRUCT(r_e);
+
/* set up the LSA QUERY INFO response */
make_r_enum_trust_dom(&r_e, enum_context, dom_name, dom_sid,
dom_name != NULL ? 0x0 : 0x80000000 | NT_STATUS_UNABLE_TO_FREE_VM);
@@ -94,6 +98,8 @@ static void lsa_reply_query_info(LSA_Q_QUERY_INFO *q_q, prs_struct *rdata,
{
LSA_R_QUERY_INFO r_q;
+ ZERO_STRUCT(r_q);
+
/* set up the LSA QUERY INFO response */
r_q.undoc_buffer = 0x22000000; /* bizarre */
@@ -237,6 +243,10 @@ static void lsa_reply_lookup_sids(prs_struct *rdata,
LSA_TRANS_NAME_ENUM names;
uint32 mapped_count = 0;
+ ZERO_STRUCT(r_l);
+ ZERO_STRUCT(ref);
+ ZERO_STRUCT(names);
+
/* set up the LSA Lookup SIDs response */
make_dom_ref(&ref, dom_name, dom_sid, other_sid1, other_sid2, other_sid3);
make_lsa_trans_names(&names, num_entries, sid, &mapped_count);
@@ -256,6 +266,8 @@ static void lsa_reply_lookup_rids(prs_struct *rdata,
{
LSA_R_LOOKUP_RIDS r_l;
+ ZERO_STRUCT(r_l);
+
/* set up the LSA Lookup RIDs response */
make_reply_lookup_rids(&r_l, num_entries, dom_rids,
dom_name, dom_sid, other_sid1, other_sid2, other_sid3);
@@ -273,6 +285,8 @@ static void api_lsa_open_policy( int uid, prs_struct *data,
{
LSA_Q_OPEN_POL q_o;
+ ZERO_STRUCT(q_o);
+
/* grab the server, object attributes and desired access flag...*/
lsa_io_q_open_pol("", &q_o, data, 0);
@@ -290,6 +304,8 @@ static void api_lsa_enum_trust_dom( int uid, prs_struct *data,
{
LSA_Q_ENUM_TRUST_DOM q_e;
+ ZERO_STRUCT(q_e);
+
/* grab the enum trust domain context etc. */
lsa_io_q_enum_trust_dom("", &q_e, data, 0);
@@ -307,6 +323,8 @@ static void api_lsa_query_info( int uid, prs_struct *data,
LSA_Q_QUERY_INFO q_i;
pstring dom_name;
+ ZERO_STRUCT(q_i);
+
/* grab the info class and policy handle */
lsa_io_q_query("", &q_i, data, 0);
@@ -328,6 +346,11 @@ static void api_lsa_lookup_sids( int uid, prs_struct *data,
DOM_SID sid_S_1_3;
DOM_SID sid_S_1_5;
+ ZERO_STRUCT(q_l);
+ ZERO_STRUCT(sid_S_1_1);
+ ZERO_STRUCT(sid_S_1_3);
+ ZERO_STRUCT(sid_S_1_5);
+
/* grab the info class and policy handle */
lsa_io_q_lookup_sids("", &q_l, data, 0);
@@ -359,6 +382,12 @@ static void api_lsa_lookup_names( int uid, prs_struct *data,
uint32 dom_rids[MAX_LOOKUP_SIDS];
uint32 dummy_g_rid;
+ ZERO_STRUCT(q_l);
+ ZERO_STRUCT(sid_S_1_1);
+ ZERO_STRUCT(sid_S_1_3);
+ ZERO_STRUCT(sid_S_1_5);
+ ZERO_STRUCT(dom_rids);
+
/* grab the info class and policy handle */
lsa_io_q_lookup_rids("", &q_l, data, 0);