diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-12-22 06:58:26 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:47:36 -0500 |
| commit | 758873b9fb46c0c0059a95c6bdeb23b17f2c80c9 (patch) | |
| tree | c560327343001da621940d28e189bb51b74899c2 /source4/libnet | |
| parent | 9a9cb35cbd96d813f047c4b57a8b8c0c0cb7c25b (diff) | |
| download | samba-758873b9fb46c0c0059a95c6bdeb23b17f2c80c9.tar.gz samba-758873b9fb46c0c0059a95c6bdeb23b17f2c80c9.tar.bz2 samba-758873b9fb46c0c0059a95c6bdeb23b17f2c80c9.zip | |
r12423: Remove DEBUG(0) printouts in favor of more information to the caller.
I assume this works better with SWAT and the like anyway.
Andrew Bartlett
(This used to be commit b11975703d5e32f6f3ad10079106b1345fa56b5c)
Diffstat (limited to 'source4/libnet')
| -rw-r--r-- | source4/libnet/libnet_join.c | 8 | ||||
| -rw-r--r-- | source4/libnet/libnet_join.h | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c index c55be7e73c..62feb8b544 100644 --- a/source4/libnet/libnet_join.c +++ b/source4/libnet/libnet_join.c @@ -745,8 +745,6 @@ NTSTATUS libnet_JoinDomain(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru } } - DEBUG(0, ("Joining domain %s\n", domain_name)); - /* establish a SAMR connection, on the same CIFS transport */ @@ -937,15 +935,13 @@ NTSTATUS libnet_JoinDomain(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru /* &cu filled in above */ status = dcerpc_samr_CreateUser2(samr_pipe, tmp_ctx, &cu); - if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, NT_STATUS_USER_EXISTS)) { + if (!NT_STATUS_IS_OK(status)) { r->out.error_string = talloc_asprintf(mem_ctx, "samr_CreateUser2 (recreate) for [%s] failed: %s\n", r->in.domain_name, nt_errstr(status)); talloc_free(tmp_ctx); return status; } - DEBUG(0, ("Recreated account in domain %s\n", domain_name)); - } } @@ -1429,6 +1425,8 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx, talloc_steal(mem_ctx, r2->out.join_password); r->out.domain_sid = r2->out.domain_sid; talloc_steal(mem_ctx, r2->out.domain_sid); + r->out.domain_name = r2->out.domain_name; + talloc_steal(mem_ctx, r2->out.domain_name); talloc_free(tmp_mem); return NT_STATUS_OK; } diff --git a/source4/libnet/libnet_join.h b/source4/libnet/libnet_join.h index d1ddc623f0..78f4fd5f12 100644 --- a/source4/libnet/libnet_join.h +++ b/source4/libnet/libnet_join.h @@ -73,6 +73,7 @@ struct libnet_Join { const char *error_string; const char *join_password; struct dom_sid *domain_sid; + const char *domain_name; } out; }; |