From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 2 Oct 2009 02:02:00 +0000 (+1000)
Subject: ds-flags: use the new name DS_DNS_FOREST_ROOT
X-Git-Tag: talloc-2.0.1~224
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=4cb055cacdc8a28f1efee1d40546baa05515e24e;p=bbaumbach%2Fsamba-autobuild%2F.git

ds-flags: use the new name DS_DNS_FOREST_ROOT

Update to use the new DS_DNS_FOREST_ROOT name, which makes it clearer
what this bit means (according to MS-ADTS doc)
---

diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index 98b65942e4d..180547063a4 100644
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -686,7 +686,7 @@ static NTSTATUS make_domain_controller_info(TALLOC_CTX *mem_ctx,
 	if (forest_name && *forest_name) {
 		info->forest_name = talloc_strdup(mem_ctx, forest_name);
 		NT_STATUS_HAVE_NO_MEMORY(info->forest_name);
-		flags |= DS_DNS_FOREST;
+		flags |= DS_DNS_FOREST_ROOT;
 	}
 
 	info->dc_flags = flags;
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index 1a45711c574..5eccd7f6a81 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -1440,7 +1440,7 @@ static WERROR dcesrv_netr_DsRGetDCNameEx2(struct dcesrv_call_state *dce_call, TA
 	info->domain_guid		= samdb_result_guid(res[0], "objectGUID");
 	info->domain_name		= lp_realm(dce_call->conn->dce_ctx->lp_ctx);
 	info->forest_name		= lp_realm(dce_call->conn->dce_ctx->lp_ctx);
-	info->dc_flags			= DS_DNS_FOREST |
+	info->dc_flags			= DS_DNS_FOREST_ROOT |
 					  DS_DNS_DOMAIN |
 					  DS_DNS_CONTROLLER |
 					  DS_SERVER_WRITABLE |
diff --git a/source4/torture/ldap/cldap.c b/source4/torture/ldap/cldap.c
index d0e97191883..6c31202a264 100644
--- a/source4/torture/ldap/cldap.c
+++ b/source4/torture/ldap/cldap.c
@@ -303,8 +303,8 @@ static bool test_cldap_netlogon_flags(struct torture_context *tctx,
 		printf("DS_DNS_CONTROLLER ");
 	if (server_type & DS_DNS_DOMAIN)
 		printf("DS_DNS_DOMAIN ");
-	if (server_type & DS_DNS_FOREST)
-		printf("DS_DNS_FOREST ");
+	if (server_type & DS_DNS_FOREST_ROOT)
+		printf("DS_DNS_FOREST_ROOT ");
 
 	printf("\n");
 
@@ -352,7 +352,7 @@ static void cldap_dump_results(struct cldap_search *search)
 
 
 /*
-  test cldap netlogon server type flag "NBT_SERVER_DS_DNS_FOREST"
+  test cldap netlogon server type flag "NBT_SERVER_FOREST_ROOT"
 */
 static bool test_cldap_netlogon_flag_ds_dns_forest(struct torture_context *tctx,
 	const char *dest)
@@ -369,7 +369,7 @@ static bool test_cldap_netlogon_flag_ds_dns_forest(struct torture_context *tctx,
 	status = cldap_socket_init(tctx, NULL, NULL, NULL, &cldap);
 	CHECK_STATUS(status, NT_STATUS_OK);
 
-	printf("Testing netlogon server type flag NBT_SERVER_DS_DNS_FOREST: ");
+	printf("Testing netlogon server type flag NBT_SERVER_FOREST_ROOT: ");
 
 	ZERO_STRUCT(search);
 	search.in.dest_address = dest;
@@ -387,7 +387,7 @@ static bool test_cldap_netlogon_flag_ds_dns_forest(struct torture_context *tctx,
 	else if (n1.ntver == NETLOGON_NT_VERSION_5EX)
 		server_type = n1.data.nt5_ex.server_type;
 
-	if (server_type & DS_DNS_FOREST) {
+	if (server_type & DS_DNS_FOREST_ROOT) {
 		struct cldap_search search2;
 		const char *attrs[] = { "defaultNamingContext", "rootDomainNamingContext", 
 			NULL };