From: Günther Deschner <gd@samba.org>
Date: Fri, 16 May 2008 10:16:04 +0000 (+0200)
Subject: libnetjoin: for informational reasons, report forest_name.
X-Git-Tag: samba-4.0.0alpha6~801^2~1331
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b2af349cfb7b434fd0e8b1ae6f15b49688d326d;p=thirdparty%2Fsamba.git

libnetjoin: for informational reasons, report forest_name.

Guenther
(This used to be commit 452a9ea4af19d3aebc35929edaf4e5adf8c1fd11)
---

diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 4cfdd504738..6426dc30791 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -689,6 +689,7 @@ static NTSTATUS libnet_join_lookup_dc_rpc(TALLOC_CTX *mem_ctx,
 		r->out.domain_is_ad = true;
 		r->out.netbios_domain_name = info->dns.name.string;
 		r->out.dns_domain_name = info->dns.dns_domain.string;
+		r->out.forest_name = info->dns.dns_forest.string;
 		r->out.domain_sid = info->dns.sid;
 	}
 
diff --git a/source3/librpc/gen_ndr/libnet_join.h b/source3/librpc/gen_ndr/libnet_join.h
index e5ec438bb58..f4c44e4e2ea 100644
--- a/source3/librpc/gen_ndr/libnet_join.h
+++ b/source3/librpc/gen_ndr/libnet_join.h
@@ -35,6 +35,7 @@ struct libnet_JoinCtx {
 		const char * account_name;
 		const char * netbios_domain_name;
 		const char * dns_domain_name;
+		const char * forest_name;
 		const char * dn;
 		struct dom_sid *domain_sid;/* [ref] */
 		uint8_t modified_config;
@@ -66,6 +67,7 @@ struct libnet_UnjoinCtx {
 	struct {
 		const char * netbios_domain_name;
 		const char * dns_domain_name;
+		const char * forest_name;
 		uint8_t modified_config;
 		const char * error_string;
 		uint8_t disabled_machine_account;
diff --git a/source3/librpc/gen_ndr/ndr_libnet_join.c b/source3/librpc/gen_ndr/ndr_libnet_join.c
index 753859f0ed7..a9241f61e16 100644
--- a/source3/librpc/gen_ndr/ndr_libnet_join.c
+++ b/source3/librpc/gen_ndr/ndr_libnet_join.c
@@ -50,6 +50,7 @@ _PUBLIC_ void ndr_print_libnet_JoinCtx(struct ndr_print *ndr, const char *name,
 		ndr_print_string(ndr, "account_name", r->out.account_name);
 		ndr_print_string(ndr, "netbios_domain_name", r->out.netbios_domain_name);
 		ndr_print_string(ndr, "dns_domain_name", r->out.dns_domain_name);
+		ndr_print_string(ndr, "forest_name", r->out.forest_name);
 		ndr_print_string(ndr, "dn", r->out.dn);
 		ndr_print_ptr(ndr, "domain_sid", r->out.domain_sid);
 		ndr->depth++;
@@ -104,6 +105,7 @@ _PUBLIC_ void ndr_print_libnet_UnjoinCtx(struct ndr_print *ndr, const char *name
 		ndr->depth++;
 		ndr_print_string(ndr, "netbios_domain_name", r->out.netbios_domain_name);
 		ndr_print_string(ndr, "dns_domain_name", r->out.dns_domain_name);
+		ndr_print_string(ndr, "forest_name", r->out.forest_name);
 		ndr_print_uint8(ndr, "modified_config", r->out.modified_config);
 		ndr_print_string(ndr, "error_string", r->out.error_string);
 		ndr_print_uint8(ndr, "disabled_machine_account", r->out.disabled_machine_account);
diff --git a/source3/librpc/idl/libnet_join.idl b/source3/librpc/idl/libnet_join.idl
index 7f6e3464556..5af6b05433f 100644
--- a/source3/librpc/idl/libnet_join.idl
+++ b/source3/librpc/idl/libnet_join.idl
@@ -35,6 +35,7 @@ interface libnetjoin
 		[out] string account_name,
 		[out] string netbios_domain_name,
 		[out] string dns_domain_name,
+		[out] string forest_name,
 		[out] string dn,
 		[out] dom_sid *domain_sid,
 		[out] boolean8 modified_config,
@@ -58,6 +59,7 @@ interface libnetjoin
 		[in,noprint] messaging_context *msg_ctx,
 		[out] string netbios_domain_name,
 		[out] string dns_domain_name,
+		[out] string forest_name,
 		[out] boolean8 modified_config,
 		[out] string error_string,
 		[out] boolean8 disabled_machine_account,