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)

diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index 166b6a730de6a46bfa1d947cf24a63dd0321d980..353fd6a7b168d0e3d114e55d61fea59373539abf 100644 (file)
--- 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,