From b7a47635caeb326cc8a5c2bd2307334a4a2ff416 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 3 Oct 2005 23:42:59 +0000 Subject: r10696: Return the realm to the caller, not NULL... Also return an indication of if the join was of a new account, or reworking an existing account. Andrew Bartlett (This used to be commit b6e4b36c4f1f90e42dd0543538956a1d89e3724b) --- source4/libnet/libnet_join.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source4/libnet') diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c index 166b6a730d..353fd6a7b1 100644 --- a/source4/libnet/libnet_join.c +++ b/source4/libnet/libnet_join.c @@ -974,7 +974,6 @@ NTSTATUS libnet_JoinDomain(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru talloc_steal(mem_ctx, cu.out.user_handle); r->out.error_string = r2.samr_handle.out.error_string; talloc_steal(mem_ctx, r2.samr_handle.out.error_string); - r->out.realm = NULL; r->out.kvno = 0; r->out.server_dn_str = NULL; talloc_free(tmp_ctx); @@ -989,7 +988,7 @@ NTSTATUS libnet_JoinDomain(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru return status; } - return NT_STATUS_OK; + return cu_status; } static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx, -- cgit