summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-04-14 06:44:30 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:19:20 -0500
commit3e819bd22c199f9cdf68c0f6258b4be17674a129 (patch)
tree1af96adc9ca4248cf3d7fd05ed3666673477fcd2
parenta633b42592080982b38f5e3cde8d32bf2fd80e7e (diff)
downloadsamba-3e819bd22c199f9cdf68c0f6258b4be17674a129.tar.gz
samba-3e819bd22c199f9cdf68c0f6258b4be17674a129.tar.bz2
samba-3e819bd22c199f9cdf68c0f6258b4be17674a129.zip
r22214: Fix incompatible pointer type warnings. Simo, please check and merge to 3_0_25
if appropriate. Volker (This used to be commit 6a4f6c5177b4837fe7a238f067abbc5739ab0812)
-rw-r--r--source3/nsswitch/idmap.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/nsswitch/idmap.c b/source3/nsswitch/idmap.c
index 3a3c2bf05f..dac1eb0521 100644
--- a/source3/nsswitch/idmap.c
+++ b/source3/nsswitch/idmap.c
@@ -828,7 +828,11 @@ static NTSTATUS idmap_new_mapping(TALLOC_CTX *ctx, struct id_map *map)
wbret = winbind_lookup_sid(ctx, map->sid, &domname, &name, &sid_type);
winbind_off();
} else {
- wbret = winbindd_lookup_name_by_sid(ctx, map->sid, &domname, &name, &sid_type);
+ char *tmp_dom, *tmp_name;
+ wbret = winbindd_lookup_name_by_sid(ctx, map->sid, &tmp_dom,
+ &tmp_name, &sid_type);
+ domname = tmp_dom;
+ name = tmp_name;
}
/* check if this is a valid SID and then map it */