From: Andrew Bartlett Date: Mon, 14 Apr 2008 16:01:40 +0000 (+0200) Subject: Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet X-Git-Tag: samba-4.0.0alpha6~801^3~339^2~115^2~5 X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=3170ae538a201f1dfe4b6eb70047a31b344a866b;hp=97e09c2f877779ca6d55684d33b1a24b8a280e51 Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet (This used to be commit f610862dc900cb3ddf0f275641bc3b66ad1f3bc4) --- diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c index 9d32088fe62..1cc63a3fb0c 100644 --- a/source4/libnet/libnet_vampire.c +++ b/source4/libnet/libnet_vampire.c @@ -586,6 +586,8 @@ NTSTATUS libnet_Vampire(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, return NT_STATUS_NO_MEMORY; } + s->lp_ctx = ctx->lp_ctx; + join = talloc_zero(s, struct libnet_JoinDomain); if (!join) { return NT_STATUS_NO_MEMORY;