From 4f41be356a4e6b311d30de3b2e36e4c33aa72ca3 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 5 May 2011 10:41:59 -0700
Subject: Fix many const compiler warnings.

---
 source3/lib/winbind_util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/lib/winbind_util.c')

diff --git a/source3/lib/winbind_util.c b/source3/lib/winbind_util.c
index f30bcfc6126..3fa1485d452 100644
--- a/source3/lib/winbind_util.c
+++ b/source3/lib/winbind_util.c
@@ -245,7 +245,7 @@ bool winbind_lookup_rids(TALLOC_CTX *mem_ctx,
 		(*types)[i] = (enum lsa_SidType)name_types[i];
 	}
 
-	wbcFreeMemory(CONST_DISCARD(char*, dom_name));
+	wbcFreeMemory(discard_const_p(char, dom_name));
 	wbcFreeMemory(namelist);
 	wbcFreeMemory(name_types);
 
-- 
cgit 


From 3d15137653a7d1b593a9af2eef12f6e5b9a04c4f Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 7 Jun 2011 11:30:12 +1000
Subject: s3-talloc Change TALLOC_ARRAY() to talloc_array()

Using the standard macro makes it easier to move code into common, as
TALLOC_ARRAY isn't standard talloc.
---
 source3/lib/winbind_util.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'source3/lib/winbind_util.c')

diff --git a/source3/lib/winbind_util.c b/source3/lib/winbind_util.c
index 3fa1485d452..b458ebe8472 100644
--- a/source3/lib/winbind_util.c
+++ b/source3/lib/winbind_util.c
@@ -237,8 +237,8 @@ bool winbind_lookup_rids(TALLOC_CTX *mem_ctx,
 	}	
 
 	*domain_name = talloc_strdup(mem_ctx, dom_name);
-	*names       = TALLOC_ARRAY(mem_ctx, const char*, num_rids);
-	*types       = TALLOC_ARRAY(mem_ctx, enum lsa_SidType, num_rids);
+	*names       = talloc_array(mem_ctx, const char*, num_rids);
+	*types       = talloc_array(mem_ctx, enum lsa_SidType, num_rids);
 
 	for(i=0; i<num_rids; i++) {
 		(*names)[i] = talloc_strdup(*names, namelist[i]);
@@ -284,7 +284,7 @@ bool winbind_get_groups(TALLOC_CTX * mem_ctx, const char *account, uint32_t *num
 	if (ret != WBC_ERR_SUCCESS)
 		return false;
 
-	*_groups = TALLOC_ARRAY(mem_ctx, gid_t, ngroups);
+	*_groups = talloc_array(mem_ctx, gid_t, ngroups);
 	if (*_groups == NULL) {
 	    wbcFreeMemory(group_list);
 	    return false;
@@ -313,7 +313,7 @@ bool winbind_get_sid_aliases(TALLOC_CTX *mem_ctx,
 
 	memcpy(&domain_sid, dom_sid, sizeof(*dom_sid));
 
-	sid_list = TALLOC_ARRAY(mem_ctx, struct wbcDomainSid, num_members);
+	sid_list = talloc_array(mem_ctx, struct wbcDomainSid, num_members);
 
 	for (i=0; i < num_members; i++) {
 	    memcpy(&sid_list[i], &members[i], sizeof(sid_list[i]));
@@ -328,7 +328,7 @@ bool winbind_get_sid_aliases(TALLOC_CTX *mem_ctx,
 		return false;
 	}
 
-	*pp_alias_rids = TALLOC_ARRAY(mem_ctx, uint32_t, num_rids);
+	*pp_alias_rids = talloc_array(mem_ctx, uint32_t, num_rids);
 	if (*pp_alias_rids == NULL) {
 		wbcFreeMemory(rids);
 		return false;
-- 
cgit