summaryrefslogtreecommitdiff
path: root/source3/rpc_server/srv_samr.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-06-01 17:01:34 +0000
committerJeremy Allison <jra@samba.org>2000-06-01 17:01:34 +0000
commitf0080e5a3979fac94d6668cf6ee9d9f61302839c (patch)
treeac4f4389195913c5a8241b25671e85a7af3b417e /source3/rpc_server/srv_samr.c
parent136544268460e56d7b551ae9efac9dc0a6b2830e (diff)
downloadsamba-f0080e5a3979fac94d6668cf6ee9d9f61302839c.tar.gz
samba-f0080e5a3979fac94d6668cf6ee9d9f61302839c.tar.bz2
samba-f0080e5a3979fac94d6668cf6ee9d9f61302839c.zip
Getting back to a compilable state (not there yet but close).
Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
Diffstat (limited to 'source3/rpc_server/srv_samr.c')
-rw-r--r--source3/rpc_server/srv_samr.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c
index 9ad1d34561..49db7a9e48 100644
--- a/source3/rpc_server/srv_samr.c
+++ b/source3/rpc_server/srv_samr.c
@@ -277,6 +277,7 @@ static BOOL get_passwd_entries(SAM_USER_INFO_21 *pw_buf,
if ((pwd = getpwent()) == NULL) break;
user_name_len = strlen(pwd->pw_name);
pw_rid = pdb_uid_to_user_rid(pwd->pw_uid);
+ ZERO_STRUCTP(&pw_buf[(*num_entries)]);
init_unistr2(&(pw_buf[(*num_entries)].uni_user_name), pwd->pw_name, user_name_len);
init_uni_hdr(&(pw_buf[(*num_entries)].hdr_user_name), user_name_len);
pw_buf[(*num_entries)].user_rid = pw_rid;
@@ -296,6 +297,7 @@ static BOOL get_passwd_entries(SAM_USER_INFO_21 *pw_buf,
while (((unmap_name = unmap_unixname(pwd->pw_name, mapped_idx)) != NULL) &&
(*num_entries < max_num_entries)) {
user_name_len = strlen(unmap_name);
+ ZERO_STRUCTP(&pw_buf[(*num_entries)]);
init_unistr2(&(pw_buf[(*num_entries)].uni_user_name), unmap_name, user_name_len);
init_uni_hdr(&(pw_buf[(*num_entries)].hdr_user_name), user_name_len);
pw_buf[(*num_entries)].user_rid = pw_rid;
@@ -661,6 +663,7 @@ static BOOL samr_reply_enum_dom_groups(SAMR_Q_ENUM_DOM_GROUPS *q_u,
got_grps = True;
num_entries = 1;
+ ZERO_STRUCTP(&pass[0]);
init_unistr2(&(pass[0].uni_user_name), dummy_group, strlen(dummy_group));
pass[0].user_rid = DOMAIN_GROUP_RID_ADMINS;
@@ -788,8 +791,7 @@ static BOOL api_samr_enum_dom_aliases(prs_struct *data, prs_struct *rdata)
/*******************************************************************
samr_reply_query_dispinfo
********************************************************************/
-static BOOL samr_reply_query_dispinfo(SAMR_Q_QUERY_DISPINFO *q_u,
- prs_struct *rdata)
+static BOOL samr_reply_query_dispinfo(SAMR_Q_QUERY_DISPINFO *q_u, prs_struct *rdata)
{
SAMR_R_QUERY_DISPINFO r_e;
SAM_INFO_CTR ctr;