summaryrefslogtreecommitdiff
path: root/source4/libnet
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-01-13 03:39:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:50:59 -0500
commit58f78fa182c4b4a046b957c89988d34ea2125696 (patch)
tree095fc563234da507b8f366ba98a0eeb0781e339b /source4/libnet
parent792951a36535c9345e6027e0940d97d511282302 (diff)
downloadsamba-58f78fa182c4b4a046b957c89988d34ea2125696.tar.gz
samba-58f78fa182c4b4a046b957c89988d34ea2125696.tar.bz2
samba-58f78fa182c4b4a046b957c89988d34ea2125696.zip
r12892: Add a 'Migrate from Windows' page to our installation section in SWAT.
Doing this required reworking ejsnet, particularly so it could take a set of credentials, not just a username and password argument. This required fixing the ejsnet.js test script, which now adds and deletes a user, and is run from 'make test'. This should prevent it being broken again. Deleting a user from ejsnet required that the matching backend be added to libnet, hooking fortunetly onto already existing code for the actual deletion. The js credentials interface now handles the 'set machine account' flag. New functions have been added to provision.js to wrap the basic operations (so we can write a command line version, as well as the web based version). Andrew Bartlett (This used to be commit a5e7c17c348c45e61699cc1626a0d5eae2df4636)
Diffstat (limited to 'source4/libnet')
-rw-r--r--source4/libnet/libnet_user.c51
-rw-r--r--source4/libnet/libnet_user.h18
2 files changed, 69 insertions, 0 deletions
diff --git a/source4/libnet/libnet_user.c b/source4/libnet/libnet_user.c
index 50cb14d290..ba9fd0cc83 100644
--- a/source4/libnet/libnet_user.c
+++ b/source4/libnet/libnet_user.c
@@ -75,3 +75,54 @@ NTSTATUS libnet_CreateUser(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru
return status;
}
+
+NTSTATUS libnet_DeleteUser(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, struct libnet_DeleteUser *r)
+{
+ NTSTATUS status;
+ struct libnet_RpcConnect cn;
+ struct libnet_rpc_domain_open dom_io;
+ struct libnet_rpc_userdel user_io;
+
+ /* connect rpc service of remote DC */
+ cn.level = LIBNET_RPC_CONNECT_PDC;
+ cn.in.name = talloc_strdup(mem_ctx, r->in.domain_name);
+ cn.in.dcerpc_iface = &dcerpc_table_samr;
+
+ status = libnet_RpcConnect(ctx, mem_ctx, &cn);
+ if (!NT_STATUS_IS_OK(status)) {
+ r->out.error_string = talloc_asprintf(mem_ctx,
+ "Connection to SAMR pipe domain '%s' PDC failed: %s\n",
+ r->in.domain_name, nt_errstr(status));
+ return status;
+ }
+
+ ctx->pipe = cn.out.dcerpc_pipe;
+
+ /* open connected domain */
+ dom_io.in.domain_name = r->in.domain_name;
+ dom_io.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+
+ status = libnet_rpc_domain_open(ctx->pipe, mem_ctx, &dom_io);
+ if (!NT_STATUS_IS_OK(status)) {
+ r->out.error_string = talloc_asprintf(mem_ctx,
+ "Opening domain to delete user account failed: %s\n",
+ nt_errstr(status));
+ return status;
+ }
+
+ ctx->domain_handle = dom_io.out.domain_handle;
+
+ /* create user */
+ user_io.in.username = r->in.user_name;
+ user_io.in.domain_handle = dom_io.out.domain_handle;
+
+ status = libnet_rpc_userdel(ctx->pipe, mem_ctx, &user_io);
+ if (!NT_STATUS_IS_OK(status)) {
+ r->out.error_string = talloc_asprintf(mem_ctx,
+ "Deleting user account failed: %s\n",
+ nt_errstr(status));
+ return status;
+ }
+
+ return status;
+}
diff --git a/source4/libnet/libnet_user.h b/source4/libnet/libnet_user.h
index 358f0d0b0f..2182ccb4e4 100644
--- a/source4/libnet/libnet_user.h
+++ b/source4/libnet/libnet_user.h
@@ -36,3 +36,21 @@ struct libnet_CreateUser {
const char *error_string;
} out;
};
+
+enum libnet_DeleteUser_level {
+ LIBNET_DELETE_USER_GENERIC,
+ LIBNET_DELETE_USER_SAMR,
+};
+
+
+struct libnet_DeleteUser {
+ enum libnet_DeleteUser_level level;
+
+ struct {
+ const char *user_name;
+ const char *domain_name;
+ } in;
+ struct {
+ const char *error_string;
+ } out;
+};