Author: idra Date: 2006-12-12 15:14:27 +0000 (Tue, 12 Dec 2006) New Revision: 20117
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20117 Log: 1st Error in the merge Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_async.c Changeset: Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_async.c =================================================================== --- branches/SAMBA_3_0/source/nsswitch/winbindd_async.c 2006-12-12 14:52:13 UTC (rev 20116) +++ branches/SAMBA_3_0/source/nsswitch/winbindd_async.c 2006-12-12 15:14:27 UTC (rev 20117) @@ -756,7 +756,7 @@ /* Lookup the sid */ - if (!winbindd_lookup_name_by_sid(state->mem_ctx, &sid, dom_name, name, + if (!winbindd_lookup_name_by_sid(state->mem_ctx, &sid, &dom_name, &name, &type)) { TALLOC_FREE(dom_name); TALLOC_FREE(name);