diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-10-03 23:42:59 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:39:20 -0500 |
| commit | b7a47635caeb326cc8a5c2bd2307334a4a2ff416 (patch) | |
| tree | d3b155639eb4d8a4abff829980e8ac37943822b0 | |
| parent | 1a3651693517332c0c15111b871c65f2411a35ae (diff) | |
| download | samba-b7a47635caeb326cc8a5c2bd2307334a4a2ff416.tar.gz samba-b7a47635caeb326cc8a5c2bd2307334a4a2ff416.tar.bz2 samba-b7a47635caeb326cc8a5c2bd2307334a4a2ff416.zip | |
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)
| -rw-r--r-- | source4/libnet/libnet_join.c | 3 |
1 files changed, 1 insertions, 2 deletions
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, |