From 0cdf5cfdfbb6b412e1d365af4f2daf20087b37f5 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Thu, 20 Dec 2007 20:59:27 +0100
Subject: Fix a missing prototype warning (This used to be commit
 93e5de23e7109432f554745b18c6d630a39f9c2b)

---
 source3/lib/netapi/joindomain.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 210763174e..10f7e94835 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "lib/netapi/joindomain.h"
 
 extern const char *opt_user_name;
 extern const char *opt_workgroup;
-- 
cgit 


From 72ffac399077ad7777f1282c94d9b661e7fa53fb Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 6 Dec 2007 19:04:49 +0100
Subject: Add NetGetJoinInformation().

Guenther
(This used to be commit d341d251d6e22e9cc1c4596038fd5fe5c7c6c174)
---
 source3/lib/netapi/joindomain.c | 53 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 10f7e94835..6da4548f05 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -181,3 +181,56 @@ WERROR NetUnjoinDomain(const char *server_name,
 
 	return werr;
 }
+
+WERROR NetGetJoinInformation(const char *server_name,
+			     const char **name_buffer,
+			     uint16_t *name_type)
+{
+	TALLOC_CTX *mem_ctx = NULL;
+	struct cli_state *cli = NULL;
+	struct rpc_pipe_client *pipe_cli = NULL;
+	NTSTATUS status;
+	WERROR werr;
+
+	mem_ctx = talloc_init("NetGetJoinInformation");
+	if (!mem_ctx) {
+		werr = WERR_NOMEM;
+		goto done;
+	}
+
+	status = cli_full_connection(&cli, NULL, server_name,
+				     NULL, 0,
+				     "IPC$", "IPC",
+				     opt_user_name, opt_workgroup,
+				     opt_password, 0, Undefined, NULL);
+
+	if (!NT_STATUS_IS_OK(status)) {
+		werr = ntstatus_to_werror(status);
+		goto done;
+	}
+
+	pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_WKSSVC,
+					    &status);
+	if (!pipe_cli) {
+		werr = ntstatus_to_werror(status);
+		goto done;
+	};
+
+	status = rpccli_wkssvc_NetrGetJoinInformation(pipe_cli, mem_ctx,
+						      server_name,
+						      name_buffer,
+						      (enum wkssvc_NetJoinStatus *)name_type,
+						      &werr);
+	if (!NT_STATUS_IS_OK(status)) {
+		werr = ntstatus_to_werror(status);
+		goto done;
+	}
+
+ done:
+	if (cli) {
+		cli_shutdown(cli);
+	}
+	TALLOC_FREE(mem_ctx);
+
+	return werr;
+}
-- 
cgit 


From 67aa44e7a230cb3cf35c184692bf5249d6d424cf Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Tue, 11 Dec 2007 21:23:40 +0100
Subject: Split NetJoinDomain() into NetJoinDomainRemote() and the unsupported
 NetJoinDomainLocal().

Guenther
(This used to be commit d2f21ce6727ec9e4df67989db07b48470d0790a4)
---
 source3/lib/netapi/joindomain.c | 96 +++++++++++++++++++++++++++++++----------
 1 file changed, 73 insertions(+), 23 deletions(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 6da4548f05..1b951d7a5c 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -24,14 +24,25 @@ extern const char *opt_user_name;
 extern const char *opt_workgroup;
 extern const char *opt_password;
 
-WERROR NetJoinDomain(const char *server_name,
-		     const char *domain_name,
-		     const char *account_ou,
-		     const char *Account,
-		     const char *password,
-		     uint32_t join_flags)
+static WERROR NetJoinDomainLocal(TALLOC_CTX *mem_ctx,
+				 const char *server_name,
+				 const char *domain_name,
+				 const char *account_ou,
+				 const char *Account,
+				 const char *password,
+				 uint32_t join_flags)
+{
+	return WERR_NOT_SUPPORTED;
+}
+
+static WERROR NetJoinDomainRemote(TALLOC_CTX *mem_ctx,
+				  const char *server_name,
+				  const char *domain_name,
+				  const char *account_ou,
+				  const char *Account,
+				  const char *password,
+				  uint32_t join_flags)
 {
-	TALLOC_CTX *mem_ctx = NULL;
 	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	struct wkssvc_PasswordBuffer encrypted_password;
@@ -41,22 +52,6 @@ WERROR NetJoinDomain(const char *server_name,
 
 	ZERO_STRUCT(encrypted_password);
 
-	mem_ctx = talloc_init("NetJoinDomain");
-	if (!mem_ctx) {
-		werr = WERR_NOMEM;
-		goto done;
-	}
-
-	if (!server_name || is_myname_or_ipaddr(server_name)) {
-		werr = WERR_NOT_SUPPORTED;
-		goto done;
-	}
-
-	if (!domain_name) {
-		werr = WERR_INVALID_PARAM;
-		goto done;
-	}
-
 	status = cli_full_connection(&cli, NULL, server_name,
 				     NULL, 0,
 				     "IPC$", "IPC",
@@ -101,6 +96,61 @@ WERROR NetJoinDomain(const char *server_name,
 		cli_set_timeout(cli, old_timeout);
 		cli_shutdown(cli);
 	}
+
+	return werr;
+}
+
+WERROR NetJoinDomain(const char *server_name,
+		     const char *domain_name,
+		     const char *account_ou,
+		     const char *Account,
+		     const char *password,
+		     uint32_t join_flags)
+{
+	TALLOC_CTX *mem_ctx = NULL;
+	WERROR werr;
+
+	mem_ctx = talloc_init("NetJoinDomain");
+	if (!mem_ctx) {
+		werr = WERR_NOMEM;
+		goto done;
+	}
+
+	if (!domain_name) {
+		werr = WERR_INVALID_PARAM;
+		goto done;
+	}
+
+	if (!server_name || is_myname_or_ipaddr(server_name)) {
+
+		const char *dc = NULL;
+
+		/* FIXME: DsGetDcName */
+		if (server_name == NULL) {
+			dc = domain_name;
+		} else {
+			dc = domain_name;
+		}
+
+		werr = NetJoinDomainLocal(mem_ctx,
+					  dc,
+					  domain_name,
+					  account_ou,
+					  Account,
+					  password,
+					  join_flags);
+
+		goto done;
+	}
+
+	werr = NetJoinDomainRemote(mem_ctx,
+				   server_name,
+				   domain_name,
+				   account_ou,
+				   Account,
+				   password,
+				   join_flags);
+done:
 	TALLOC_FREE(mem_ctx);
 
 	return werr;
-- 
cgit 


From 4f6e8dfa51dfef72d13efc4acd3ede37d1f69eac Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Tue, 11 Dec 2007 21:32:16 +0100
Subject: Fill in NetJoinDomainLocal().

Guenther
(This used to be commit 4896f22bb50ea9ae0c4807ed9b2dd4283c254364)
---
 source3/lib/netapi/joindomain.c | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 1b951d7a5c..96983d43e3 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -32,7 +32,41 @@ static WERROR NetJoinDomainLocal(TALLOC_CTX *mem_ctx,
 				 const char *password,
 				 uint32_t join_flags)
 {
-	return WERR_NOT_SUPPORTED;
+	struct libnet_JoinCtx *r = NULL;
+	WERROR werr;
+
+	werr = libnet_init_JoinCtx(mem_ctx, &r);
+	W_ERROR_NOT_OK_RETURN(werr);
+
+	if (!server_name || !domain_name) {
+		return WERR_INVALID_PARAM;
+	}
+
+	r->in.server_name = talloc_strdup(mem_ctx, server_name);
+	W_ERROR_HAVE_NO_MEMORY(r->in.server_name);
+
+	r->in.domain_name = talloc_strdup(mem_ctx, domain_name);
+	W_ERROR_HAVE_NO_MEMORY(r->in.domain_name);
+
+	if (account_ou) {
+		r->in.account_ou = talloc_strdup(mem_ctx, account_ou);
+		W_ERROR_HAVE_NO_MEMORY(r->in.account_ou);
+	}
+
+	if (Account) {
+		r->in.admin_account = talloc_strdup(mem_ctx, Account);
+		W_ERROR_HAVE_NO_MEMORY(r->in.admin_account);
+	}
+
+	if (password) {
+		r->in.password = talloc_strdup(mem_ctx, password);
+		W_ERROR_HAVE_NO_MEMORY(r->in.password);
+	}
+
+	r->in.join_flags = join_flags;
+	r->in.modify_config = true;
+
+	return libnet_Join(mem_ctx, r);
 }
 
 static WERROR NetJoinDomainRemote(TALLOC_CTX *mem_ctx,
-- 
cgit 


From 5b5f75d229978d5b9fe14dca768fd8b68d2ab319 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 13 Dec 2007 16:21:27 +0100
Subject: Fill in local branch of NetGetJoinInformation().

Guenther
(This used to be commit 46db8754511f915c296771e08e822ba810f804d5)
---
 source3/lib/netapi/joindomain.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 96983d43e3..bc26c22370 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -282,6 +282,32 @@ WERROR NetGetJoinInformation(const char *server_name,
 		goto done;
 	}
 
+	if (!server_name || is_myname_or_ipaddr(server_name)) {
+		if ((lp_security() == SEC_ADS) && lp_realm()) {
+			*name_buffer = SMB_STRDUP(lp_realm());
+		} else {
+			*name_buffer = SMB_STRDUP(lp_workgroup());
+		}
+		if (!*name_buffer) {
+			werr = WERR_NOMEM;
+			goto done;
+		}
+		switch (lp_server_role()) {
+			case ROLE_DOMAIN_MEMBER:
+			case ROLE_DOMAIN_PDC:
+			case ROLE_DOMAIN_BDC:
+				*name_type = NetSetupDomainName;
+				break;
+			case ROLE_STANDALONE:
+			default:
+				*name_type = NetSetupWorkgroupName;
+				break;
+		}
+
+		werr = WERR_OK;
+		goto done;
+	}
+
 	status = cli_full_connection(&cli, NULL, server_name,
 				     NULL, 0,
 				     "IPC$", "IPC",
-- 
cgit 


From 9dc0ac4637fdd05a95099c0a6a857c51ca811453 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Tue, 18 Dec 2007 02:15:49 +0100
Subject: Getting rid of external credentials in libnetapi.

Guenther
(This used to be commit c10481dba01a084b0f9c4265f3408a0ec9a8b646)
---
 source3/lib/netapi/joindomain.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index bc26c22370..8287cd046f 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -20,10 +20,6 @@
 #include "includes.h"
 #include "lib/netapi/joindomain.h"
 
-extern const char *opt_user_name;
-extern const char *opt_workgroup;
-extern const char *opt_password;
-
 static WERROR NetJoinDomainLocal(TALLOC_CTX *mem_ctx,
 				 const char *server_name,
 				 const char *domain_name,
@@ -219,8 +215,10 @@ WERROR NetUnjoinDomain(const char *server_name,
 	status = cli_full_connection(&cli, NULL, server_name,
 				     NULL, 0,
 				     "IPC$", "IPC",
-				     opt_user_name, opt_workgroup,
-				     opt_password, 0, Undefined, NULL);
+				     ctx->username,
+				     ctx->workgroup,
+				     ctx->password,
+				     0, Undefined, NULL);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		werr = ntstatus_to_werror(status);
@@ -311,8 +309,10 @@ WERROR NetGetJoinInformation(const char *server_name,
 	status = cli_full_connection(&cli, NULL, server_name,
 				     NULL, 0,
 				     "IPC$", "IPC",
-				     opt_user_name, opt_workgroup,
-				     opt_password, 0, Undefined, NULL);
+				     ctx->username,
+				     ctx->workgroup,
+				     ctx->password,
+				     0, Undefined, NULL);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		werr = ntstatus_to_werror(status);
-- 
cgit 


From 62b3fd209d65caba36595dfbcde83fd74f4047b7 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Tue, 18 Dec 2007 02:52:34 +0100
Subject: Missed on instance of external creds.

Guenther
(This used to be commit 65d50f518766ab0a8115c2599d190e642eb00754)
---
 source3/lib/netapi/joindomain.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 8287cd046f..67e53d4391 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -85,8 +85,10 @@ static WERROR NetJoinDomainRemote(TALLOC_CTX *mem_ctx,
 	status = cli_full_connection(&cli, NULL, server_name,
 				     NULL, 0,
 				     "IPC$", "IPC",
-				     opt_user_name, opt_workgroup,
-				     opt_password, 0, Undefined, NULL);
+				     ctx->username,
+				     ctx->workgroup,
+				     ctx->password,
+				     0, Undefined, NULL);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		werr = ntstatus_to_werror(status);
-- 
cgit 


From dab660b9dc42b9e5817e59de4c97009796548b92 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Tue, 18 Dec 2007 02:54:18 +0100
Subject: Move NetJoinDomain and friends to NET_API_STATUS and the static
 libnetapi_ctx.

Guenther
(This used to be commit e640c3a4a7695613e9e619516befbaf3d44ecb10)
---
 source3/lib/netapi/joindomain.c | 126 +++++++++++++++++++++++++++++++++-------
 1 file changed, 106 insertions(+), 20 deletions(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 67e53d4391..a0d3319998 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -18,9 +18,11 @@
  */
 
 #include "includes.h"
-#include "lib/netapi/joindomain.h"
 
-static WERROR NetJoinDomainLocal(TALLOC_CTX *mem_ctx,
+#include "lib/netapi/netapi.h"
+#include "libnet/libnet.h"
+
+static WERROR NetJoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 				 const char *server_name,
 				 const char *domain_name,
 				 const char *account_ou,
@@ -65,7 +67,7 @@ static WERROR NetJoinDomainLocal(TALLOC_CTX *mem_ctx,
 	return libnet_Join(mem_ctx, r);
 }
 
-static WERROR NetJoinDomainRemote(TALLOC_CTX *mem_ctx,
+static WERROR NetJoinDomainRemote(struct libnetapi_ctx *ctx,
 				  const char *server_name,
 				  const char *domain_name,
 				  const char *account_ou,
@@ -105,7 +107,7 @@ static WERROR NetJoinDomainRemote(TALLOC_CTX *mem_ctx,
 	};
 
 	if (password) {
-		encode_wkssvc_join_password_buffer(mem_ctx,
+		encode_wkssvc_join_password_buffer(ctx,
 						   password,
 						   &cli->user_session_key,
 						   &encrypted_password);
@@ -113,7 +115,7 @@ static WERROR NetJoinDomainRemote(TALLOC_CTX *mem_ctx,
 
 	old_timeout = cli_set_timeout(cli, 60000);
 
-	status = rpccli_wkssvc_NetrJoinDomain2(pipe_cli, mem_ctx,
+	status = rpccli_wkssvc_NetrJoinDomain2(pipe_cli, ctx,
 					       server_name, domain_name,
 					       account_ou, Account,
 					       &encrypted_password,
@@ -132,12 +134,13 @@ static WERROR NetJoinDomainRemote(TALLOC_CTX *mem_ctx,
 	return werr;
 }
 
-WERROR NetJoinDomain(const char *server_name,
-		     const char *domain_name,
-		     const char *account_ou,
-		     const char *Account,
-		     const char *password,
-		     uint32_t join_flags)
+static WERROR libnetapi_NetJoinDomain(struct libnetapi_ctx *ctx,
+				      const char *server_name,
+				      const char *domain_name,
+				      const char *account_ou,
+				      const char *Account,
+				      const char *password,
+				      uint32_t join_flags)
 {
 	TALLOC_CTX *mem_ctx = NULL;
 	WERROR werr;
@@ -164,7 +167,7 @@ WERROR NetJoinDomain(const char *server_name,
 			dc = domain_name;
 		}
 
-		werr = NetJoinDomainLocal(mem_ctx,
+		werr = NetJoinDomainLocal(ctx,
 					  dc,
 					  domain_name,
 					  account_ou,
@@ -175,7 +178,7 @@ WERROR NetJoinDomain(const char *server_name,
 		goto done;
 	}
 
-	werr = NetJoinDomainRemote(mem_ctx,
+	werr = NetJoinDomainRemote(ctx,
 				   server_name,
 				   domain_name,
 				   account_ou,
@@ -188,10 +191,41 @@ done:
 	return werr;
 }
 
-WERROR NetUnjoinDomain(const char *server_name,
-		       const char *account,
-		       const char *password,
-		       uint32_t unjoin_flags)
+NET_API_STATUS NetJoinDomain(const char *server_name,
+			     const char *domain_name,
+			     const char *account_ou,
+			     const char *Account,
+			     const char *password,
+			     uint32_t join_flags)
+{
+	struct libnetapi_ctx *ctx = NULL;
+	NET_API_STATUS status;
+	WERROR werr;
+
+	status = libnetapi_getctx(&ctx);
+	if (status != 0) {
+		return status;
+	}
+
+	werr = libnetapi_NetJoinDomain(ctx,
+				       server_name,
+				       domain_name,
+				       account_ou,
+				       Account,
+				       password,
+				       join_flags);
+	if (!W_ERROR_IS_OK(werr)) {
+		return W_ERROR_V(werr);
+	}
+
+	return 0;
+}
+
+static WERROR libnetapi_NetUnjoinDomain(struct libnetapi_ctx *ctx,
+					const char *server_name,
+					const char *account,
+					const char *password,
+					uint32_t unjoin_flags)
 {
 	TALLOC_CTX *mem_ctx = NULL;
 	struct cli_state *cli = NULL;
@@ -266,9 +300,37 @@ WERROR NetUnjoinDomain(const char *server_name,
 	return werr;
 }
 
-WERROR NetGetJoinInformation(const char *server_name,
-			     const char **name_buffer,
-			     uint16_t *name_type)
+NET_API_STATUS NetUnjoinDomain(const char *server_name,
+			       const char *account,
+			       const char *password,
+			       uint32_t unjoin_flags)
+{
+	struct libnetapi_ctx *ctx = NULL;
+	NET_API_STATUS status;
+	WERROR werr;
+
+	status = libnetapi_getctx(&ctx);
+	if (status != 0) {
+		return status;
+	}
+
+	werr = libnetapi_NetUnjoinDomain(ctx,
+					 server_name,
+					 account,
+					 password,
+					 unjoin_flags);
+	if (!W_ERROR_IS_OK(werr)) {
+		return W_ERROR_V(werr);
+	}
+
+	return 0;
+}
+
+
+WERROR libnetapi_NetGetJoinInformation(struct libnetapi_ctx *ctx,
+				       const char *server_name,
+				       const char **name_buffer,
+				       uint16_t *name_type)
 {
 	TALLOC_CTX *mem_ctx = NULL;
 	struct cli_state *cli = NULL;
@@ -346,3 +408,27 @@ WERROR NetGetJoinInformation(const char *server_name,
 
 	return werr;
 }
+
+NET_API_STATUS NetGetJoinInformation(const char *server_name,
+				     const char **name_buffer,
+				     uint16_t *name_type)
+{
+	struct libnetapi_ctx *ctx = NULL;
+	NET_API_STATUS status;
+	WERROR werr;
+
+	status = libnetapi_getctx(&ctx);
+	if (status != 0) {
+		return status;
+	}
+
+	werr = libnetapi_NetGetJoinInformation(ctx,
+					       server_name,
+					       name_buffer,
+					       name_type);
+	if (!W_ERROR_IS_OK(werr)) {
+		return W_ERROR_V(werr);
+	}
+
+	return 0;
+}
-- 
cgit 


From d1548d035f3c296d5044b9aa47fc350cb62e4e2d Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Wed, 19 Dec 2007 02:25:15 +0100
Subject: Use DsGetDcName in local libnetapi join to find a dc.

Guenther
(This used to be commit fbc60c1648ff8b1fa0ae33c09237e41232f9769c)
---
 source3/lib/netapi/joindomain.c | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index a0d3319998..c6bf3d687a 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -36,16 +36,31 @@ static WERROR NetJoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 	werr = libnet_init_JoinCtx(mem_ctx, &r);
 	W_ERROR_NOT_OK_RETURN(werr);
 
-	if (!server_name || !domain_name) {
+	if (!domain_name) {
 		return WERR_INVALID_PARAM;
 	}
 
-	r->in.server_name = talloc_strdup(mem_ctx, server_name);
-	W_ERROR_HAVE_NO_MEMORY(r->in.server_name);
-
 	r->in.domain_name = talloc_strdup(mem_ctx, domain_name);
 	W_ERROR_HAVE_NO_MEMORY(r->in.domain_name);
 
+	if (server_name) {
+		r->in.server_name = talloc_strdup(mem_ctx, server_name);
+		W_ERROR_HAVE_NO_MEMORY(r->in.server_name);
+	} else if (join_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE) {
+		NTSTATUS status;
+		struct DS_DOMAIN_CONTROLLER_INFO *info = NULL;
+		uint32_t flags = DS_DIRECTORY_SERVICE_REQUIRED |
+				 DS_WRITABLE_REQUIRED |
+				 DS_RETURN_DNS_NAME;
+		status = DsGetDcName(mem_ctx, NULL, domain_name,
+				     NULL, NULL, flags, &info);
+		if (!NT_STATUS_IS_OK(status)) {
+			return ntstatus_to_werror(status);
+		}
+		r->in.server_name = talloc_strdup(mem_ctx, info->domain_controller_name);
+		W_ERROR_HAVE_NO_MEMORY(r->in.server_name);
+	}
+
 	if (account_ou) {
 		r->in.account_ou = talloc_strdup(mem_ctx, account_ou);
 		W_ERROR_HAVE_NO_MEMORY(r->in.account_ou);
@@ -158,17 +173,8 @@ static WERROR libnetapi_NetJoinDomain(struct libnetapi_ctx *ctx,
 
 	if (!server_name || is_myname_or_ipaddr(server_name)) {
 
-		const char *dc = NULL;
-
-		/* FIXME: DsGetDcName */
-		if (server_name == NULL) {
-			dc = domain_name;
-		} else {
-			dc = domain_name;
-		}
-
 		werr = NetJoinDomainLocal(ctx,
-					  dc,
+					  server_name,
 					  domain_name,
 					  account_ou,
 					  Account,
-- 
cgit 


From 14652eab180fa9555607a413e5d1b429d1e1673c Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Wed, 19 Dec 2007 10:52:45 +0100
Subject: Fix NetJoinDomainLocal.

Guenther
(This used to be commit 24605c9175fb313c9c888783817da755cd8ce594)
---
 source3/lib/netapi/joindomain.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index c6bf3d687a..180210f707 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -43,10 +43,7 @@ static WERROR NetJoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 	r->in.domain_name = talloc_strdup(mem_ctx, domain_name);
 	W_ERROR_HAVE_NO_MEMORY(r->in.domain_name);
 
-	if (server_name) {
-		r->in.server_name = talloc_strdup(mem_ctx, server_name);
-		W_ERROR_HAVE_NO_MEMORY(r->in.server_name);
-	} else if (join_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE) {
+	if (join_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE) {
 		NTSTATUS status;
 		struct DS_DOMAIN_CONTROLLER_INFO *info = NULL;
 		uint32_t flags = DS_DIRECTORY_SERVICE_REQUIRED |
-- 
cgit 


From 8f7723fc28cf9e71b0d5ef2890dbe95ae3fc5e07 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Wed, 19 Dec 2007 10:55:52 +0100
Subject: Remove unrequired TALLOC_CTX from libnetapi_NetJoinDomain & friends.

Guenther
(This used to be commit 96ebdca45b998da7e6137973dea717bf3ac76328)
---
 source3/lib/netapi/joindomain.c | 39 +++++----------------------------------
 1 file changed, 5 insertions(+), 34 deletions(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 180210f707..08a39549f9 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -154,44 +154,28 @@ static WERROR libnetapi_NetJoinDomain(struct libnetapi_ctx *ctx,
 				      const char *password,
 				      uint32_t join_flags)
 {
-	TALLOC_CTX *mem_ctx = NULL;
-	WERROR werr;
-
-	mem_ctx = talloc_init("NetJoinDomain");
-	if (!mem_ctx) {
-		werr = WERR_NOMEM;
-		goto done;
-	}
-
 	if (!domain_name) {
-		werr = WERR_INVALID_PARAM;
-		goto done;
+		return WERR_INVALID_PARAM;
 	}
 
 	if (!server_name || is_myname_or_ipaddr(server_name)) {
 
-		werr = NetJoinDomainLocal(ctx,
+		return NetJoinDomainLocal(ctx,
 					  server_name,
 					  domain_name,
 					  account_ou,
 					  Account,
 					  password,
 					  join_flags);
-
-		goto done;
 	}
 
-	werr = NetJoinDomainRemote(ctx,
+	return NetJoinDomainRemote(ctx,
 				   server_name,
 				   domain_name,
 				   account_ou,
 				   Account,
 				   password,
 				   join_flags);
-done:
-	TALLOC_FREE(mem_ctx);
-
-	return werr;
 }
 
 NET_API_STATUS NetJoinDomain(const char *server_name,
@@ -230,7 +214,6 @@ static WERROR libnetapi_NetUnjoinDomain(struct libnetapi_ctx *ctx,
 					const char *password,
 					uint32_t unjoin_flags)
 {
-	TALLOC_CTX *mem_ctx = NULL;
 	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	struct wkssvc_PasswordBuffer encrypted_password;
@@ -240,17 +223,6 @@ static WERROR libnetapi_NetUnjoinDomain(struct libnetapi_ctx *ctx,
 
 	ZERO_STRUCT(encrypted_password);
 
-	mem_ctx = talloc_init("NetUnjoinDomain");
-	if (!mem_ctx) {
-		werr = WERR_NOMEM;
-		goto done;
-	}
-
-	if (!server_name || is_myname_or_ipaddr(server_name)) {
-		werr = WERR_NOT_SUPPORTED;
-		goto done;
-	}
-
 	status = cli_full_connection(&cli, NULL, server_name,
 				     NULL, 0,
 				     "IPC$", "IPC",
@@ -274,7 +246,7 @@ static WERROR libnetapi_NetUnjoinDomain(struct libnetapi_ctx *ctx,
 	};
 
 	if (password) {
-		encode_wkssvc_join_password_buffer(mem_ctx,
+		encode_wkssvc_join_password_buffer(ctx,
 						   password,
 						   &cli->user_session_key,
 						   &encrypted_password);
@@ -282,7 +254,7 @@ static WERROR libnetapi_NetUnjoinDomain(struct libnetapi_ctx *ctx,
 
 	old_timeout = cli_set_timeout(cli, 60000);
 
-	status = rpccli_wkssvc_NetrUnjoinDomain2(pipe_cli, mem_ctx,
+	status = rpccli_wkssvc_NetrUnjoinDomain2(pipe_cli, ctx,
 						 server_name,
 						 account,
 						 &encrypted_password,
@@ -298,7 +270,6 @@ static WERROR libnetapi_NetUnjoinDomain(struct libnetapi_ctx *ctx,
 		cli_set_timeout(cli, old_timeout);
 		cli_shutdown(cli);
 	}
-	TALLOC_FREE(mem_ctx);
 
 	return werr;
 }
-- 
cgit 


From 75276ac2e3cb2d92e17231c906128bf98eea5d50 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Wed, 19 Dec 2007 11:03:45 +0100
Subject: Add support for remote and local unjoining in libnetapi.

Guenther
(This used to be commit 74048fe7cfbd05994d533bea4a477d6ca93449d9)
---
 source3/lib/netapi/joindomain.c | 94 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 89 insertions(+), 5 deletions(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 08a39549f9..2cc93e2545 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -208,11 +208,73 @@ NET_API_STATUS NetJoinDomain(const char *server_name,
 	return 0;
 }
 
-static WERROR libnetapi_NetUnjoinDomain(struct libnetapi_ctx *ctx,
-					const char *server_name,
-					const char *account,
-					const char *password,
-					uint32_t unjoin_flags)
+static WERROR NetUnjoinDomainLocal(struct libnetapi_ctx *mem_ctx,
+				   const char *server_name,
+				   const char *account,
+				   const char *password,
+				   uint32_t unjoin_flags)
+{
+	struct libnet_UnjoinCtx *r = NULL;
+	struct dom_sid domain_sid;
+	WERROR werr;
+
+	if (!secrets_fetch_domain_sid(lp_workgroup(), &domain_sid)) {
+		return WERR_SETUP_NOT_JOINED;
+	}
+
+	werr = libnet_init_UnjoinCtx(mem_ctx, &r);
+	W_ERROR_NOT_OK_RETURN(werr);
+
+	if (server_name) {
+		r->in.server_name = talloc_strdup(mem_ctx, server_name);
+		W_ERROR_HAVE_NO_MEMORY(r->in.server_name);
+	} else {
+
+		NTSTATUS status;
+		const char *domain = NULL;
+		struct DS_DOMAIN_CONTROLLER_INFO *info = NULL;
+		uint32_t flags = DS_DIRECTORY_SERVICE_REQUIRED |
+				 DS_WRITABLE_REQUIRED |
+				 DS_IS_FLAT_NAME |
+				 DS_RETURN_DNS_NAME;
+		if (lp_realm()) {
+			domain = lp_realm();
+		} else {
+			domain = lp_workgroup();
+		}
+		status = DsGetDcName(mem_ctx, NULL, domain,
+				     NULL, NULL, flags, &info);
+		if (!NT_STATUS_IS_OK(status)) {
+			return ntstatus_to_werror(status);
+		}
+		r->in.server_name = talloc_strdup(mem_ctx, info->domain_controller_name);
+		W_ERROR_HAVE_NO_MEMORY(r->in.server_name);
+	}
+
+	if (account) {
+		r->in.admin_account = talloc_strdup(mem_ctx, account);
+		W_ERROR_HAVE_NO_MEMORY(r->in.admin_account);
+	}
+
+	if (password) {
+		r->in.password = talloc_strdup(mem_ctx, password);
+		W_ERROR_HAVE_NO_MEMORY(r->in.password);
+	}
+
+	r->in.unjoin_flags = unjoin_flags;
+	r->in.modify_config = true;
+
+	r->in.domain_sid = &domain_sid;
+
+	return libnet_Unjoin(mem_ctx, r);
+
+}
+
+static WERROR NetUnjoinDomainRemote(struct libnetapi_ctx *ctx,
+				    const char *server_name,
+				    const char *account,
+				    const char *password,
+				    uint32_t unjoin_flags)
 {
 	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
@@ -274,6 +336,28 @@ static WERROR libnetapi_NetUnjoinDomain(struct libnetapi_ctx *ctx,
 	return werr;
 }
 
+static WERROR libnetapi_NetUnjoinDomain(struct libnetapi_ctx *ctx,
+					const char *server_name,
+					const char *account,
+					const char *password,
+					uint32_t unjoin_flags)
+{
+	if (!server_name || is_myname_or_ipaddr(server_name)) {
+
+		return NetUnjoinDomainLocal(ctx,
+					    server_name,
+					    account,
+					    password,
+					    unjoin_flags);
+	}
+
+	return NetUnjoinDomainRemote(ctx,
+				     server_name,
+				     account,
+				     password,
+				     unjoin_flags);
+}
+
 NET_API_STATUS NetUnjoinDomain(const char *server_name,
 			       const char *account,
 			       const char *password,
-- 
cgit 


From 2bed9564dbe4fc3bc86d6ba231c5f2ecce468b5a Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Wed, 19 Dec 2007 13:52:51 +0100
Subject: Split out local and remote paths for NetGetJoinInformation.

Guenther
(This used to be commit d1e4f9dd5cde79f915e3e0f652621d966aa850e8)
---
 source3/lib/netapi/joindomain.c | 92 +++++++++++++++++++++++------------------
 1 file changed, 52 insertions(+), 40 deletions(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 2cc93e2545..0c8d645db9 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -384,50 +384,16 @@ NET_API_STATUS NetUnjoinDomain(const char *server_name,
 	return 0;
 }
 
-
-WERROR libnetapi_NetGetJoinInformation(struct libnetapi_ctx *ctx,
-				       const char *server_name,
-				       const char **name_buffer,
-				       uint16_t *name_type)
+static WERROR NetGetJoinInformationRemote(struct libnetapi_ctx *ctx,
+					  const char *server_name,
+					  const char **name_buffer,
+					  uint16_t *name_type)
 {
-	TALLOC_CTX *mem_ctx = NULL;
 	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
 
-	mem_ctx = talloc_init("NetGetJoinInformation");
-	if (!mem_ctx) {
-		werr = WERR_NOMEM;
-		goto done;
-	}
-
-	if (!server_name || is_myname_or_ipaddr(server_name)) {
-		if ((lp_security() == SEC_ADS) && lp_realm()) {
-			*name_buffer = SMB_STRDUP(lp_realm());
-		} else {
-			*name_buffer = SMB_STRDUP(lp_workgroup());
-		}
-		if (!*name_buffer) {
-			werr = WERR_NOMEM;
-			goto done;
-		}
-		switch (lp_server_role()) {
-			case ROLE_DOMAIN_MEMBER:
-			case ROLE_DOMAIN_PDC:
-			case ROLE_DOMAIN_BDC:
-				*name_type = NetSetupDomainName;
-				break;
-			case ROLE_STANDALONE:
-			default:
-				*name_type = NetSetupWorkgroupName;
-				break;
-		}
-
-		werr = WERR_OK;
-		goto done;
-	}
-
 	status = cli_full_connection(&cli, NULL, server_name,
 				     NULL, 0,
 				     "IPC$", "IPC",
@@ -448,7 +414,7 @@ WERROR libnetapi_NetGetJoinInformation(struct libnetapi_ctx *ctx,
 		goto done;
 	};
 
-	status = rpccli_wkssvc_NetrGetJoinInformation(pipe_cli, mem_ctx,
+	status = rpccli_wkssvc_NetrGetJoinInformation(pipe_cli, ctx,
 						      server_name,
 						      name_buffer,
 						      (enum wkssvc_NetJoinStatus *)name_type,
@@ -462,11 +428,57 @@ WERROR libnetapi_NetGetJoinInformation(struct libnetapi_ctx *ctx,
 	if (cli) {
 		cli_shutdown(cli);
 	}
-	TALLOC_FREE(mem_ctx);
 
 	return werr;
 }
 
+static WERROR NetGetJoinInformationLocal(struct libnetapi_ctx *ctx,
+					 const char *server_name,
+					 const char **name_buffer,
+					 uint16_t *name_type)
+{
+	if ((lp_security() == SEC_ADS) && lp_realm()) {
+		*name_buffer = SMB_STRDUP(lp_realm());
+	} else {
+		*name_buffer = SMB_STRDUP(lp_workgroup());
+	}
+	if (!*name_buffer) {
+		return WERR_NOMEM;
+	}
+
+	switch (lp_server_role()) {
+		case ROLE_DOMAIN_MEMBER:
+		case ROLE_DOMAIN_PDC:
+		case ROLE_DOMAIN_BDC:
+			*name_type = NetSetupDomainName;
+			break;
+		case ROLE_STANDALONE:
+		default:
+			*name_type = NetSetupWorkgroupName;
+			break;
+	}
+
+	return WERR_OK;
+}
+
+WERROR libnetapi_NetGetJoinInformation(struct libnetapi_ctx *ctx,
+				       const char *server_name,
+				       const char **name_buffer,
+				       uint16_t *name_type)
+{
+	if (!server_name || is_myname_or_ipaddr(server_name)) {
+		return NetGetJoinInformationLocal(ctx,
+						  server_name,
+						  name_buffer,
+						  name_type);
+	}
+
+	return NetGetJoinInformationRemote(ctx,
+					   server_name,
+					   name_buffer,
+					   name_type);
+}
+
 NET_API_STATUS NetGetJoinInformation(const char *server_name,
 				     const char **name_buffer,
 				     uint16_t *name_type)
-- 
cgit 


From f2fe17245436f8e68be2d5ad96b77721828f040a Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 20 Dec 2007 12:12:06 +0100
Subject: Keep libnetapi_NetX calls static for now.

Guenther
(This used to be commit c255654c68923aca3e258906e49be82d719d5ccd)
---
 source3/lib/netapi/joindomain.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 0c8d645db9..0c3e021520 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -461,10 +461,10 @@ static WERROR NetGetJoinInformationLocal(struct libnetapi_ctx *ctx,
 	return WERR_OK;
 }
 
-WERROR libnetapi_NetGetJoinInformation(struct libnetapi_ctx *ctx,
-				       const char *server_name,
-				       const char **name_buffer,
-				       uint16_t *name_type)
+static WERROR libnetapi_NetGetJoinInformation(struct libnetapi_ctx *ctx,
+					      const char *server_name,
+					      const char **name_buffer,
+					      uint16_t *name_type)
 {
 	if (!server_name || is_myname_or_ipaddr(server_name)) {
 		return NetGetJoinInformationLocal(ctx,
-- 
cgit 


From 1a30bdb506f3f288e781cf1f445696c7eceb823e Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 20 Dec 2007 15:03:12 +0100
Subject: Remove doubled cli_set_timeout calls from libnetapi.

Guenther
(This used to be commit acc5d8e784b706001457ceeeb9bd4961a13d57d2)
---
 source3/lib/netapi/joindomain.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 0c3e021520..e3d5eada02 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -109,8 +109,6 @@ static WERROR NetJoinDomainRemote(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	old_timeout = cli_set_timeout(cli, 60000);
-
 	pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_WKSSVC,
 					    &status);
 	if (!pipe_cli) {
@@ -298,8 +296,6 @@ static WERROR NetUnjoinDomainRemote(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	old_timeout = cli_set_timeout(cli, 60000);
-
 	pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_WKSSVC,
 					    &status);
 	if (!pipe_cli) {
-- 
cgit 


From 6afaafe083ad23e51743ccd5245cf7384b2c4bd9 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 3 Jan 2008 13:36:56 +0100
Subject: Let DsGetDCName figure out whether domain_name is a flat_name when
 unjoining.

Guenther
(This used to be commit 75165ba4e7acafaca42f6afd1fb8b56e00bcbed7)
---
 source3/lib/netapi/joindomain.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index e3d5eada02..60f48a7b5e 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -233,7 +233,6 @@ static WERROR NetUnjoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 		struct DS_DOMAIN_CONTROLLER_INFO *info = NULL;
 		uint32_t flags = DS_DIRECTORY_SERVICE_REQUIRED |
 				 DS_WRITABLE_REQUIRED |
-				 DS_IS_FLAT_NAME |
 				 DS_RETURN_DNS_NAME;
 		if (lp_realm()) {
 			domain = lp_realm();
-- 
cgit 


From be88a6738823e3a19c4e935dd970ab4c078ceaee Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 3 Jan 2008 16:41:38 +0100
Subject: Minor libnetapi join cosmetic cleanup.

Guenther
(This used to be commit 4deef80bed374af5032c0f3081d2ee3c70be99df)
---
 source3/lib/netapi/joindomain.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 60f48a7b5e..d200c9b7b0 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -114,7 +114,7 @@ static WERROR NetJoinDomainRemote(struct libnetapi_ctx *ctx,
 	if (!pipe_cli) {
 		werr = ntstatus_to_werror(status);
 		goto done;
-	};
+	}
 
 	if (password) {
 		encode_wkssvc_join_password_buffer(ctx,
@@ -300,7 +300,7 @@ static WERROR NetUnjoinDomainRemote(struct libnetapi_ctx *ctx,
 	if (!pipe_cli) {
 		werr = ntstatus_to_werror(status);
 		goto done;
-	};
+	}
 
 	if (password) {
 		encode_wkssvc_join_password_buffer(ctx,
@@ -407,7 +407,7 @@ static WERROR NetGetJoinInformationRemote(struct libnetapi_ctx *ctx,
 	if (!pipe_cli) {
 		werr = ntstatus_to_werror(status);
 		goto done;
-	};
+	}
 
 	status = rpccli_wkssvc_NetrGetJoinInformation(pipe_cli, ctx,
 						      server_name,
-- 
cgit 


From 0399df22f0f0999338e48d7b9598a7b2f7b9aab5 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 4 Jan 2008 17:01:52 +0100
Subject: In libnet_join finally separate the admin from the machine pwd
 entirely.

Guenther
(This used to be commit d88bb94f0ef00ddbb48498797bd11448e0d74645)
---
 source3/lib/netapi/joindomain.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index d200c9b7b0..921f816cbe 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -1,7 +1,7 @@
 /*
  *  Unix SMB/CIFS implementation.
  *  NetApi Join Support
- *  Copyright (C) Guenther Deschner 2007
+ *  Copyright (C) Guenther Deschner 2007-2008
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -69,8 +69,8 @@ static WERROR NetJoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 	}
 
 	if (password) {
-		r->in.password = talloc_strdup(mem_ctx, password);
-		W_ERROR_HAVE_NO_MEMORY(r->in.password);
+		r->in.admin_password = talloc_strdup(mem_ctx, password);
+		W_ERROR_HAVE_NO_MEMORY(r->in.admin_password);
 	}
 
 	r->in.join_flags = join_flags;
@@ -254,8 +254,8 @@ static WERROR NetUnjoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 	}
 
 	if (password) {
-		r->in.password = talloc_strdup(mem_ctx, password);
-		W_ERROR_HAVE_NO_MEMORY(r->in.password);
+		r->in.admin_password = talloc_strdup(mem_ctx, password);
+		W_ERROR_HAVE_NO_MEMORY(r->in.admin_password);
 	}
 
 	r->in.unjoin_flags = unjoin_flags;
-- 
cgit 


From 28ef4878d937405340cc1984ef674ad0b670ef0c Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 4 Jan 2008 17:11:14 +0100
Subject: Rename server_name to dc_name in libnet join structures.

Guenther
(This used to be commit ff5e15b1ba0d5c39ceef9f9995c107e510162564)
---
 source3/lib/netapi/joindomain.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 921f816cbe..0d4452e1df 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -54,8 +54,9 @@ static WERROR NetJoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 		if (!NT_STATUS_IS_OK(status)) {
 			return ntstatus_to_werror(status);
 		}
-		r->in.server_name = talloc_strdup(mem_ctx, info->domain_controller_name);
-		W_ERROR_HAVE_NO_MEMORY(r->in.server_name);
+		r->in.dc_name = talloc_strdup(mem_ctx,
+					      info->domain_controller_name);
+		W_ERROR_HAVE_NO_MEMORY(r->in.dc_name);
 	}
 
 	if (account_ou) {
@@ -224,8 +225,8 @@ static WERROR NetUnjoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 	W_ERROR_NOT_OK_RETURN(werr);
 
 	if (server_name) {
-		r->in.server_name = talloc_strdup(mem_ctx, server_name);
-		W_ERROR_HAVE_NO_MEMORY(r->in.server_name);
+		r->in.dc_name = talloc_strdup(mem_ctx, server_name);
+		W_ERROR_HAVE_NO_MEMORY(r->in.dc_name);
 	} else {
 
 		NTSTATUS status;
@@ -244,8 +245,9 @@ static WERROR NetUnjoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 		if (!NT_STATUS_IS_OK(status)) {
 			return ntstatus_to_werror(status);
 		}
-		r->in.server_name = talloc_strdup(mem_ctx, info->domain_controller_name);
-		W_ERROR_HAVE_NO_MEMORY(r->in.server_name);
+		r->in.dc_name = talloc_strdup(mem_ctx,
+					      info->domain_controller_name);
+		W_ERROR_HAVE_NO_MEMORY(r->in.dc_name);
 	}
 
 	if (account) {
-- 
cgit 


From 395c366237dec1a38a53248d2e8df17f877207aa Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 4 Jan 2008 22:56:31 +0100
Subject: Do not pass emtpy wkssvc_PasswordBuffers to rpc functions.

Guenther
(This used to be commit fe75e5ccdfc2609380367e59215637b0de1ef241)
---
 source3/lib/netapi/joindomain.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 0d4452e1df..c7849c952f 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -90,13 +90,11 @@ static WERROR NetJoinDomainRemote(struct libnetapi_ctx *ctx,
 {
 	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
-	struct wkssvc_PasswordBuffer encrypted_password;
+	struct wkssvc_PasswordBuffer *encrypted_password = NULL;
 	NTSTATUS status;
 	WERROR werr;
 	unsigned int old_timeout = 0;
 
-	ZERO_STRUCT(encrypted_password);
-
 	status = cli_full_connection(&cli, NULL, server_name,
 				     NULL, 0,
 				     "IPC$", "IPC",
@@ -129,7 +127,7 @@ static WERROR NetJoinDomainRemote(struct libnetapi_ctx *ctx,
 	status = rpccli_wkssvc_NetrJoinDomain2(pipe_cli, ctx,
 					       server_name, domain_name,
 					       account_ou, Account,
-					       &encrypted_password,
+					       encrypted_password,
 					       join_flags, &werr);
 	if (!NT_STATUS_IS_OK(status)) {
 		werr = ntstatus_to_werror(status);
@@ -277,13 +275,11 @@ static WERROR NetUnjoinDomainRemote(struct libnetapi_ctx *ctx,
 {
 	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
-	struct wkssvc_PasswordBuffer encrypted_password;
+	struct wkssvc_PasswordBuffer *encrypted_password = NULL;
 	NTSTATUS status;
 	WERROR werr;
 	unsigned int old_timeout = 0;
 
-	ZERO_STRUCT(encrypted_password);
-
 	status = cli_full_connection(&cli, NULL, server_name,
 				     NULL, 0,
 				     "IPC$", "IPC",
@@ -316,7 +312,7 @@ static WERROR NetUnjoinDomainRemote(struct libnetapi_ctx *ctx,
 	status = rpccli_wkssvc_NetrUnjoinDomain2(pipe_cli, ctx,
 						 server_name,
 						 account,
-						 &encrypted_password,
+						 encrypted_password,
 						 unjoin_flags,
 						 &werr);
 	if (!NT_STATUS_IS_OK(status)) {
-- 
cgit 


From 0b92d8bc79172dc587f53ce4b35a8fa3128ae0ea Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Mon, 7 Jan 2008 18:40:25 +0100
Subject: Free libnet_JoinCtx after joining.

Guenther
(This used to be commit 5abae9ef15fa9884c5c4a0e256274f70f6ecd779)
---
 source3/lib/netapi/joindomain.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index c7849c952f..8fe6193f40 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -77,7 +77,10 @@ static WERROR NetJoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 	r->in.join_flags = join_flags;
 	r->in.modify_config = true;
 
-	return libnet_Join(mem_ctx, r);
+	werr = libnet_Join(mem_ctx, r);
+	TALLOC_FREE(r);
+
+	return werr;
 }
 
 static WERROR NetJoinDomainRemote(struct libnetapi_ctx *ctx,
-- 
cgit 


From 528d253cc834235213f29411a058485681260140 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Mon, 7 Jan 2008 18:41:49 +0100
Subject: Rearrange order of libnet join context init.

Guenther
(This used to be commit 89669c66f27fb47c9769d1058e29bff83f862752)
---
 source3/lib/netapi/joindomain.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 8fe6193f40..ceb7ca10d9 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -33,13 +33,13 @@ static WERROR NetJoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 	struct libnet_JoinCtx *r = NULL;
 	WERROR werr;
 
-	werr = libnet_init_JoinCtx(mem_ctx, &r);
-	W_ERROR_NOT_OK_RETURN(werr);
-
 	if (!domain_name) {
 		return WERR_INVALID_PARAM;
 	}
 
+	werr = libnet_init_JoinCtx(mem_ctx, &r);
+	W_ERROR_NOT_OK_RETURN(werr);
+
 	r->in.domain_name = talloc_strdup(mem_ctx, domain_name);
 	W_ERROR_HAVE_NO_MEMORY(r->in.domain_name);
 
-- 
cgit 


From d6659f8ac84d5b3f19fb16a739657240f835c358 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Mon, 7 Jan 2008 20:08:45 +0100
Subject: In the local path of NetJoinDomain, try to get error string from
 libnetjoin.

Guenther
(This used to be commit 0f0f0e13022da584b77e850fec2cef6169e1ac28)
---
 source3/lib/netapi/joindomain.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index ceb7ca10d9..aa8ec6e0b5 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -78,6 +78,9 @@ static WERROR NetJoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 	r->in.modify_config = true;
 
 	werr = libnet_Join(mem_ctx, r);
+	if (!W_ERROR_IS_OK(werr) && r->out.error_string) {
+		libnetapi_set_error_string(mem_ctx, r->out.error_string);
+	}
 	TALLOC_FREE(r);
 
 	return werr;
-- 
cgit 


From 200bba3ad6592952041daa9da9805941c6dd03ba Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Tue, 8 Jan 2008 11:54:51 +0100
Subject: Make name_buffer in NetGetJoinInformation() talloced.

Guenther
(This used to be commit 421905fb608df6736944ac21ac67abee24991521)
---
 source3/lib/netapi/joindomain.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index aa8ec6e0b5..e4fb63eebb 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -437,9 +437,9 @@ static WERROR NetGetJoinInformationLocal(struct libnetapi_ctx *ctx,
 					 uint16_t *name_type)
 {
 	if ((lp_security() == SEC_ADS) && lp_realm()) {
-		*name_buffer = SMB_STRDUP(lp_realm());
+		*name_buffer = talloc_strdup(ctx, lp_realm());
 	} else {
-		*name_buffer = SMB_STRDUP(lp_workgroup());
+		*name_buffer = talloc_strdup(ctx, lp_workgroup());
 	}
 	if (!*name_buffer) {
 		return WERR_NOMEM;
-- 
cgit 


From c79ce2ffa3f7d00ce6a2cd6008c203e3042b0b02 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 11 Jan 2008 15:32:20 +0100
Subject: As long as DsGetDcName is not part of libnetapi, lowercase the fn
 name.

Guenther
(This used to be commit 19a980f52044a170618629e5b0484c1f6b586e5f)
---
 source3/lib/netapi/joindomain.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index e4fb63eebb..b268e41a2a 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -49,7 +49,7 @@ static WERROR NetJoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 		uint32_t flags = DS_DIRECTORY_SERVICE_REQUIRED |
 				 DS_WRITABLE_REQUIRED |
 				 DS_RETURN_DNS_NAME;
-		status = DsGetDcName(mem_ctx, NULL, domain_name,
+		status = dsgetdcname(mem_ctx, NULL, domain_name,
 				     NULL, NULL, flags, &info);
 		if (!NT_STATUS_IS_OK(status)) {
 			return ntstatus_to_werror(status);
@@ -244,7 +244,7 @@ static WERROR NetUnjoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 		} else {
 			domain = lp_workgroup();
 		}
-		status = DsGetDcName(mem_ctx, NULL, domain,
+		status = dsgetdcname(mem_ctx, NULL, domain,
 				     NULL, NULL, flags, &info);
 		if (!NT_STATUS_IS_OK(status)) {
 			return ntstatus_to_werror(status);
-- 
cgit 


From b1424846c60848d685853fcf632ab766543e05ee Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 18 Jan 2008 02:38:35 +0100
Subject: Cosmetics and error string reporting for libnetapi.

Guenther
(This used to be commit 4ca33928512bd71268bafd41d2b608e814a7295f)
---
 source3/lib/netapi/joindomain.c | 57 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 51 insertions(+), 6 deletions(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index b268e41a2a..43662b3ffa 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -22,6 +22,9 @@
 #include "lib/netapi/netapi.h"
 #include "libnet/libnet.h"
 
+/****************************************************************
+****************************************************************/
+
 static WERROR NetJoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 				 const char *server_name,
 				 const char *domain_name,
@@ -52,6 +55,8 @@ static WERROR NetJoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 		status = dsgetdcname(mem_ctx, NULL, domain_name,
 				     NULL, NULL, flags, &info);
 		if (!NT_STATUS_IS_OK(status)) {
+			libnetapi_set_error_string(mem_ctx,
+				"%s", get_friendly_nt_error_msg(status));
 			return ntstatus_to_werror(status);
 		}
 		r->in.dc_name = talloc_strdup(mem_ctx,
@@ -79,13 +84,16 @@ static WERROR NetJoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 
 	werr = libnet_Join(mem_ctx, r);
 	if (!W_ERROR_IS_OK(werr) && r->out.error_string) {
-		libnetapi_set_error_string(mem_ctx, r->out.error_string);
+		libnetapi_set_error_string(mem_ctx, "%s", r->out.error_string);
 	}
 	TALLOC_FREE(r);
 
 	return werr;
 }
 
+/****************************************************************
+****************************************************************/
+
 static WERROR NetJoinDomainRemote(struct libnetapi_ctx *ctx,
 				  const char *server_name,
 				  const char *domain_name,
@@ -149,6 +157,9 @@ static WERROR NetJoinDomainRemote(struct libnetapi_ctx *ctx,
 	return werr;
 }
 
+/****************************************************************
+****************************************************************/
+
 static WERROR libnetapi_NetJoinDomain(struct libnetapi_ctx *ctx,
 				      const char *server_name,
 				      const char *domain_name,
@@ -181,6 +192,10 @@ static WERROR libnetapi_NetJoinDomain(struct libnetapi_ctx *ctx,
 				   join_flags);
 }
 
+/****************************************************************
+ NetJoinDomain
+****************************************************************/
+
 NET_API_STATUS NetJoinDomain(const char *server_name,
 			     const char *domain_name,
 			     const char *account_ou,
@@ -208,9 +223,12 @@ NET_API_STATUS NetJoinDomain(const char *server_name,
 		return W_ERROR_V(werr);
 	}
 
-	return 0;
+	return NET_API_STATUS_SUCCESS;
 }
 
+/****************************************************************
+****************************************************************/
+
 static WERROR NetUnjoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 				   const char *server_name,
 				   const char *account,
@@ -232,7 +250,6 @@ static WERROR NetUnjoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 		r->in.dc_name = talloc_strdup(mem_ctx, server_name);
 		W_ERROR_HAVE_NO_MEMORY(r->in.dc_name);
 	} else {
-
 		NTSTATUS status;
 		const char *domain = NULL;
 		struct DS_DOMAIN_CONTROLLER_INFO *info = NULL;
@@ -247,6 +264,8 @@ static WERROR NetUnjoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 		status = dsgetdcname(mem_ctx, NULL, domain,
 				     NULL, NULL, flags, &info);
 		if (!NT_STATUS_IS_OK(status)) {
+			libnetapi_set_error_string(mem_ctx,
+				"%s", get_friendly_nt_error_msg(status));
 			return ntstatus_to_werror(status);
 		}
 		r->in.dc_name = talloc_strdup(mem_ctx,
@@ -266,13 +285,22 @@ static WERROR NetUnjoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 
 	r->in.unjoin_flags = unjoin_flags;
 	r->in.modify_config = true;
+	r->in.debug = true;
 
 	r->in.domain_sid = &domain_sid;
 
-	return libnet_Unjoin(mem_ctx, r);
+	werr = libnet_Unjoin(mem_ctx, r);
+	if (!W_ERROR_IS_OK(werr) && r->out.error_string) {
+		libnetapi_set_error_string(mem_ctx, "%s", r->out.error_string);
+	}
+	TALLOC_FREE(r);
 
+	return werr;
 }
 
+/****************************************************************
+****************************************************************/
+
 static WERROR NetUnjoinDomainRemote(struct libnetapi_ctx *ctx,
 				    const char *server_name,
 				    const char *account,
@@ -335,6 +363,9 @@ static WERROR NetUnjoinDomainRemote(struct libnetapi_ctx *ctx,
 	return werr;
 }
 
+/****************************************************************
+****************************************************************/
+
 static WERROR libnetapi_NetUnjoinDomain(struct libnetapi_ctx *ctx,
 					const char *server_name,
 					const char *account,
@@ -357,6 +388,10 @@ static WERROR libnetapi_NetUnjoinDomain(struct libnetapi_ctx *ctx,
 				     unjoin_flags);
 }
 
+/****************************************************************
+ NetUnjoinDomain
+****************************************************************/
+
 NET_API_STATUS NetUnjoinDomain(const char *server_name,
 			       const char *account,
 			       const char *password,
@@ -380,9 +415,12 @@ NET_API_STATUS NetUnjoinDomain(const char *server_name,
 		return W_ERROR_V(werr);
 	}
 
-	return 0;
+	return NET_API_STATUS_SUCCESS;
 }
 
+/****************************************************************
+****************************************************************/
+
 static WERROR NetGetJoinInformationRemote(struct libnetapi_ctx *ctx,
 					  const char *server_name,
 					  const char **name_buffer,
@@ -431,6 +469,9 @@ static WERROR NetGetJoinInformationRemote(struct libnetapi_ctx *ctx,
 	return werr;
 }
 
+/****************************************************************
+****************************************************************/
+
 static WERROR NetGetJoinInformationLocal(struct libnetapi_ctx *ctx,
 					 const char *server_name,
 					 const char **name_buffer,
@@ -478,6 +519,10 @@ static WERROR libnetapi_NetGetJoinInformation(struct libnetapi_ctx *ctx,
 					   name_type);
 }
 
+/****************************************************************
+ NetGetJoinInformation
+****************************************************************/
+
 NET_API_STATUS NetGetJoinInformation(const char *server_name,
 				     const char **name_buffer,
 				     uint16_t *name_type)
@@ -499,5 +544,5 @@ NET_API_STATUS NetGetJoinInformation(const char *server_name,
 		return W_ERROR_V(werr);
 	}
 
-	return 0;
+	return NET_API_STATUS_SUCCESS;
 }
-- 
cgit 


From b18fd380bd142933b7c1a341629aac61c8799d22 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 18 Jan 2008 02:50:33 +0100
Subject: Add NetGetJoinableOUs() to libnetapi (incl. example).

Guenther
(This used to be commit 8858e403e1940c362d307b4d4125f977abb0b96a)
---
 source3/lib/netapi/joindomain.c | 192 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 192 insertions(+)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 43662b3ffa..cbfc6c01e3 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -546,3 +546,195 @@ NET_API_STATUS NetGetJoinInformation(const char *server_name,
 
 	return NET_API_STATUS_SUCCESS;
 }
+
+/****************************************************************
+****************************************************************/
+
+static WERROR NetGetJoinableOUsLocal(struct libnetapi_ctx *ctx,
+				     const char *server_name,
+				     const char *domain,
+				     const char *account,
+				     const char *password,
+				     uint32_t *ou_count,
+				     const char ***ous)
+{
+	NTSTATUS status;
+	ADS_STATUS ads_status;
+	ADS_STRUCT *ads = NULL;
+	struct DS_DOMAIN_CONTROLLER_INFO *info = NULL;
+	uint32_t flags = DS_DIRECTORY_SERVICE_REQUIRED |
+			 DS_RETURN_DNS_NAME;
+
+	status = dsgetdcname(ctx, NULL, domain,
+			     NULL, NULL, flags, &info);
+	if (!NT_STATUS_IS_OK(status)) {
+		libnetapi_set_error_string(ctx, "%s",
+			get_friendly_nt_error_msg(status));
+		return ntstatus_to_werror(status);
+	}
+
+	ads = ads_init(domain, domain, info->domain_controller_name);
+	if (!ads) {
+		return WERR_GENERAL_FAILURE;
+	}
+
+	SAFE_FREE(ads->auth.user_name);
+	if (account) {
+		ads->auth.user_name = SMB_STRDUP(account);
+	} else if (ctx->username) {
+		ads->auth.user_name = SMB_STRDUP(ctx->username);
+	}
+
+	SAFE_FREE(ads->auth.password);
+	if (password) {
+		ads->auth.password = SMB_STRDUP(password);
+	} else if (ctx->password) {
+		ads->auth.password = SMB_STRDUP(ctx->password);
+	}
+
+	ads_status = ads_connect(ads);
+	if (!ADS_ERR_OK(ads_status)) {
+		ads_destroy(&ads);
+		return WERR_DEFAULT_JOIN_REQUIRED;
+	}
+
+	ads_status = ads_get_joinable_ous(ads, ctx,
+					  (char ***)ous,
+					  (size_t *)ou_count);
+	if (!ADS_ERR_OK(ads_status)) {
+		ads_destroy(&ads);
+		return WERR_DEFAULT_JOIN_REQUIRED;
+	}
+
+	ads_destroy(&ads);
+	return WERR_OK;
+}
+
+/****************************************************************
+****************************************************************/
+
+static WERROR NetGetJoinableOUsRemote(struct libnetapi_ctx *ctx,
+				      const char *server_name,
+				      const char *domain,
+				      const char *account,
+				      const char *password,
+				      uint32_t *ou_count,
+				      const char ***ous)
+{
+	struct cli_state *cli = NULL;
+	struct rpc_pipe_client *pipe_cli = NULL;
+	struct wkssvc_PasswordBuffer *encrypted_password = NULL;
+	NTSTATUS status;
+	WERROR werr;
+
+	status = cli_full_connection(&cli, NULL, server_name,
+				     NULL, 0,
+				     "IPC$", "IPC",
+				     ctx->username,
+				     ctx->workgroup,
+				     ctx->password,
+				     0, Undefined, NULL);
+
+	if (!NT_STATUS_IS_OK(status)) {
+		werr = ntstatus_to_werror(status);
+		goto done;
+	}
+
+	pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_WKSSVC,
+					    &status);
+	if (!pipe_cli) {
+		werr = ntstatus_to_werror(status);
+		goto done;
+	}
+
+	if (password) {
+		encode_wkssvc_join_password_buffer(ctx,
+						   password,
+						   &cli->user_session_key,
+						   &encrypted_password);
+	}
+
+	status = rpccli_wkssvc_NetrGetJoinableOus2(pipe_cli, ctx,
+						   server_name,
+						   domain,
+						   account,
+						   encrypted_password,
+						   ou_count,
+						   ous,
+						   &werr);
+	if (!NT_STATUS_IS_OK(status)) {
+		werr = ntstatus_to_werror(status);
+		goto done;
+	}
+
+ done:
+	if (cli) {
+		cli_shutdown(cli);
+	}
+
+	return werr;
+}
+
+/****************************************************************
+****************************************************************/
+
+static WERROR libnetapi_NetGetJoinableOUs(struct libnetapi_ctx *ctx,
+					  const char *server_name,
+					  const char *domain,
+					  const char *account,
+					  const char *password,
+					  uint32_t *ou_count,
+					  const char ***ous)
+{
+	if (!server_name || is_myname_or_ipaddr(server_name)) {
+		return NetGetJoinableOUsLocal(ctx,
+					      server_name,
+					      domain,
+					      account,
+					      password,
+					      ou_count,
+					      ous);
+	}
+
+	return NetGetJoinableOUsRemote(ctx,
+				       server_name,
+				       domain,
+				       account,
+				       password,
+				       ou_count,
+				       ous);
+}
+
+/****************************************************************
+ NetGetJoinableOUs
+****************************************************************/
+
+NET_API_STATUS NetGetJoinableOUs(const char *server_name,
+				 const char *domain,
+				 const char *account,
+				 const char *password,
+				 uint32_t *ou_count,
+				 const char ***ous)
+{
+	struct libnetapi_ctx *ctx = NULL;
+	NET_API_STATUS status;
+	WERROR werr;
+
+	status = libnetapi_getctx(&ctx);
+	if (status != 0) {
+		return status;
+	}
+
+	werr = libnetapi_NetGetJoinableOUs(ctx,
+					   server_name,
+					   domain,
+					   account,
+					   password,
+					   ou_count,
+					   ous);
+	if (!W_ERROR_IS_OK(werr)) {
+		return W_ERROR_V(werr);
+	}
+
+	return NET_API_STATUS_SUCCESS;
+}
-- 
cgit 


From db40120c73f4d4cbb132f94cd3c5859fbdad0f5a Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 18 Jan 2008 08:48:44 +0100
Subject: Fix the build w/o ADS.

Guenther
(This used to be commit 645f2376d40fabdc787902ac7506ad7234616619)
---
 source3/lib/netapi/joindomain.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index cbfc6c01e3..133aff3dd8 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -558,6 +558,7 @@ static WERROR NetGetJoinableOUsLocal(struct libnetapi_ctx *ctx,
 				     uint32_t *ou_count,
 				     const char ***ous)
 {
+#ifdef WITH_ADS
 	NTSTATUS status;
 	ADS_STATUS ads_status;
 	ADS_STRUCT *ads = NULL;
@@ -608,6 +609,9 @@ static WERROR NetGetJoinableOUsLocal(struct libnetapi_ctx *ctx,
 
 	ads_destroy(&ads);
 	return WERR_OK;
+#else
+	return WERR_NOT_SUPPORTED;
+#endif
 }
 
 /****************************************************************
-- 
cgit 


From 5ab43ae0d8e66a1fd4c877089df52282367be7dd Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Sat, 26 Jan 2008 01:39:33 +0100
Subject: Eliminate remote tree of dsgetdcname (which will happen in libnetapi
 then).

Guenther
(This used to be commit fd490d236b1fb73a75c457b75128c9b98719418f)
---
 source3/lib/netapi/joindomain.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/lib/netapi/joindomain.c')

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 133aff3dd8..55f334b5e1 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -52,7 +52,7 @@ static WERROR NetJoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 		uint32_t flags = DS_DIRECTORY_SERVICE_REQUIRED |
 				 DS_WRITABLE_REQUIRED |
 				 DS_RETURN_DNS_NAME;
-		status = dsgetdcname(mem_ctx, NULL, domain_name,
+		status = dsgetdcname(mem_ctx, domain_name,
 				     NULL, NULL, flags, &info);
 		if (!NT_STATUS_IS_OK(status)) {
 			libnetapi_set_error_string(mem_ctx,
@@ -261,7 +261,7 @@ static WERROR NetUnjoinDomainLocal(struct libnetapi_ctx *mem_ctx,
 		} else {
 			domain = lp_workgroup();
 		}
-		status = dsgetdcname(mem_ctx, NULL, domain,
+		status = dsgetdcname(mem_ctx, domain,
 				     NULL, NULL, flags, &info);
 		if (!NT_STATUS_IS_OK(status)) {
 			libnetapi_set_error_string(mem_ctx,
@@ -566,7 +566,7 @@ static WERROR NetGetJoinableOUsLocal(struct libnetapi_ctx *ctx,
 	uint32_t flags = DS_DIRECTORY_SERVICE_REQUIRED |
 			 DS_RETURN_DNS_NAME;
 
-	status = dsgetdcname(ctx, NULL, domain,
+	status = dsgetdcname(ctx, domain,
 			     NULL, NULL, flags, &info);
 	if (!NT_STATUS_IS_OK(status)) {
 		libnetapi_set_error_string(ctx, "%s",
-- 
cgit