summaryrefslogtreecommitdiff
path: root/source3/rpcclient/cmd_samr.c
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1999-10-21 19:02:57 +0000
committerLuke Leighton <lkcl@samba.org>1999-10-21 19:02:57 +0000
commit45b794bdde0cb906216425c8fc2af8610aa8ad3c (patch)
tree6dd018021c24dee66dc57b23d3c876acc658293c /source3/rpcclient/cmd_samr.c
parent52fed795e156b9db8a0f29d9087042ccdec093f5 (diff)
downloadsamba-45b794bdde0cb906216425c8fc2af8610aa8ad3c.tar.gz
samba-45b794bdde0cb906216425c8fc2af8610aa8ad3c.tar.bz2
samba-45b794bdde0cb906216425c8fc2af8610aa8ad3c.zip
the dynamic memory alloc blood-fest goes on...
(This used to be commit 134b20e2a7b5ddfa4cc9bf100de5025c7b98f594)
Diffstat (limited to 'source3/rpcclient/cmd_samr.c')
-rw-r--r--source3/rpcclient/cmd_samr.c26
1 files changed, 12 insertions, 14 deletions
diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 910db7eae3..66b10319ed 100644
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -1311,12 +1311,6 @@ static void req_alias_info(struct client_info *info, uint16 fnum,
}
}
- if (rid != NULL)
- {
- free(rid);
- rid = NULL;
- }
-
/* send user alias query */
if (samr_query_useraliases(smb_cli, fnum,
&info->dom.samr_pol_open_builtindom,
@@ -1347,11 +1341,6 @@ static void req_alias_info(struct client_info *info, uint16 fnum,
free(ptr_sid);
ptr_sid = NULL;
}
- if (rid != NULL)
- {
- free(rid);
- rid = NULL;
- }
if (als_sid != NULL)
{
free(als_sid);
@@ -1987,13 +1976,13 @@ static void req_groupmem_info(struct client_info *info, uint16 fnum,
uint32 group_rid)
{
uint32 num_mem;
- uint32 rid_mem[MAX_LOOKUP_SIDS];
- uint32 attr_mem[MAX_LOOKUP_SIDS];
+ uint32 *rid_mem = NULL;
+ uint32 *attr_mem = NULL;
/* get group members */
if (get_samr_query_groupmem(smb_cli, fnum,
&info->dom.samr_pol_open_domain,
- group_rid, &num_mem, rid_mem, attr_mem))
+ group_rid, &num_mem, &rid_mem, &attr_mem))
{
BOOL res3 = True;
int num_names = 0;
@@ -2017,6 +2006,15 @@ static void req_groupmem_info(struct client_info *info, uint16 fnum,
free(type);
}
}
+
+ if (attr_mem != NULL)
+ {
+ free(attr_mem);
+ }
+ if (rid_mem != NULL)
+ {
+ free(rid_mem);
+ }
}
/****************************************************************************