summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/libnet/libnet_join.c8
-rw-r--r--source4/libnet/libnet_join.h1
-rw-r--r--source4/utils/net/net_join.c4
3 files changed, 7 insertions, 6 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;
};
diff --git a/source4/utils/net/net_join.c b/source4/utils/net/net_join.c
index bec82c72d1..8140108ceb 100644
--- a/source4/utils/net/net_join.c
+++ b/source4/utils/net/net_join.c
@@ -66,7 +66,7 @@ int net_join(struct net_context *ctx, int argc, const char **argv)
if (!r) {
return -1;
}
- /* prepare password change */
+ /* prepare parameters for the join */
r->in.netbios_name = lp_netbios_name();
r->in.domain_name = domain_name;
r->in.secure_channel_type = secure_channel_type;
@@ -83,6 +83,8 @@ int net_join(struct net_context *ctx, int argc, const char **argv)
talloc_free(libnetctx);
return -1;
}
+ d_printf("Joined domain %s (%s)\n", r->out.domain_name, dom_sid_string(ctx->mem_ctx, r->out.domain_sid));
+
talloc_free(libnetctx);
return 0;
}