r4088: Get medieval on our ass about malloc.... :-). Take control of all our allocation

[samba.git] / source3 / passdb / util_sam_sid.c

diff --git a/source3/passdb/util_sam_sid.c b/source3/passdb/util_sam_sid.c
index 7bc6da94c030871a992a408b1e3f322c2a3776d6..c93c3400bd00e45e4f4b46ffa07a6c5c1f69ea59 100644 (file)
--- a/source3/passdb/util_sam_sid.c
+++ b/source3/passdb/util_sam_sid.c
@@ -106,16 +106,16 @@ static void init_sid_name_map (void)
                /* This is not lp_workgroup() for good reason:
                   it must stay around longer than the lp_*() 
                   strings do */
-               sid_name_map[i].name = strdup(lp_workgroup());
+               sid_name_map[i].name = SMB_STRDUP(lp_workgroup());
                sid_name_map[i].known_users = NULL;
                i++;
                sid_name_map[i].sid = get_global_sam_sid();
-               sid_name_map[i].name = strdup(global_myname());
+               sid_name_map[i].name = SMB_STRDUP(global_myname());
                sid_name_map[i].known_users = NULL;
                i++;
        } else {
                sid_name_map[i].sid = get_global_sam_sid();
-               sid_name_map[i].name = strdup(global_myname());
+               sid_name_map[i].name = SMB_STRDUP(global_myname());
                sid_name_map[i].known_users = NULL;
                i++;
        }
@@ -317,7 +317,7 @@ BOOL map_name_to_wellknown_sid(DOM_SID *sid, enum SID_NAME_USE *use, const char
 
 void add_sid_to_array(const DOM_SID *sid, DOM_SID **sids, int *num)
 {
-       *sids = Realloc(*sids, ((*num)+1) * sizeof(DOM_SID));
+       *sids = SMB_REALLOC_ARRAY(*sids, DOM_SID, (*num)+1);
 
        if (*sids == NULL)
                return;