summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-05-25 13:51:14 +0200
committerVolker Lendecke <vl@samba.org>2008-05-25 13:53:45 +0200
commit1a1fc2f8146ebc6cda852b236c9589e282e4bd8c (patch)
tree85bd18c702646491695037ef582cdcb9ee96f282
parentaacfa7b3ad7060245d906ea49c39533a6f509f26 (diff)
downloadsamba-1a1fc2f8146ebc6cda852b236c9589e282e4bd8c.tar.gz
samba-1a1fc2f8146ebc6cda852b236c9589e282e4bd8c.tar.bz2
samba-1a1fc2f8146ebc6cda852b236c9589e282e4bd8c.zip
Fix two c++ warnings
(This used to be commit 3b1dae7c31b881834ca4494c4434ae97a56ce6c7)
-rw-r--r--source3/winbindd/winbindd_async.c2
-rw-r--r--source3/winbindd/winbindd_group.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/source3/winbindd/winbindd_async.c b/source3/winbindd/winbindd_async.c
index 635bc6b244..bc0f9d836b 100644
--- a/source3/winbindd/winbindd_async.c
+++ b/source3/winbindd/winbindd_async.c
@@ -468,7 +468,7 @@ static void listgroups_recv(TALLOC_CTX *mem_ctx, bool success,
}
cont(private_data, True, response->data.name.dom_name,
- response->extra_data.data);
+ (char *)response->extra_data.data);
SAFE_FREE(response->extra_data.data);
}
diff --git a/source3/winbindd/winbindd_group.c b/source3/winbindd/winbindd_group.c
index dd2fc6f6b5..d10609a83f 100644
--- a/source3/winbindd/winbindd_group.c
+++ b/source3/winbindd/winbindd_group.c
@@ -1412,7 +1412,8 @@ static void listgroups_recv(void *private_data, bool success, fstring dom_name,
{
/* extra_data comes to us as a '\0' terminated string of comma
separated groups */
- struct listgroups_state *state = private_data;
+ struct listgroups_state *state = talloc_get_type_abort(
+ private_data, struct listgroups_state);
/* Append groups from one domain onto the whole list */
if (extra_data) {