svn commit: samba r4484 - in branches/SAMBA_4_0/source: . rpc_server/dssetup

[metze at samba.org]

Author: metze
Date: 2005-01-02 16:24:05 +0000 (Sun, 02 Jan 2005)
New Revision: 4484

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4484

Log:
- use the nTMixedDomain attribute to check if our domain is mixed mode or not

metze

Modified:
   branches/SAMBA_4_0/source/provision.ldif
   branches/SAMBA_4_0/source/rpc_server/dssetup/dcesrv_dssetup.c


Changeset:
Modified: branches/SAMBA_4_0/source/provision.ldif
===================================================================
--- branches/SAMBA_4_0/source/provision.ldif	2005-01-02 16:11:59 UTC (rev 4483)
+++ branches/SAMBA_4_0/source/provision.ldif	2005-01-02 16:24:05 UTC (rev 4484)
@@ -66,6 +66,7 @@
 pwdHistoryLength: 24
 objectSid: ${DOMAINSID}
 serverState: 1
+nTMixedDomain: 1
 uASCompat: 1
 modifiedCount: 1
 objectCategory: CN=Domain-DNS,CN=Schema,CN=Configuration,${BASEDN}

Modified: branches/SAMBA_4_0/source/rpc_server/dssetup/dcesrv_dssetup.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/dssetup/dcesrv_dssetup.c	2005-01-02 16:11:59 UTC (rev 4483)
+++ branches/SAMBA_4_0/source/rpc_server/dssetup/dcesrv_dssetup.c	2005-01-02 16:24:05 UTC (rev 4484)
@@ -39,7 +39,7 @@
 	case DS_ROLE_BASIC_INFORMATION:
 	{
 		void *sam_ctx;
-		const char * const attrs[] = { "dnsDomain", "objectGUID", "name", NULL };
+		const char * const attrs[] = { "dnsDomain", "nTMixedDomain", "objectGUID", "name", NULL };
 		int ret;
 		struct ldb_message **res;
 		union dssetup_DsRoleInfo *info;
@@ -95,13 +95,17 @@
 				return WERR_SERVER_UNAVAILABLE;
 			}
 
-			flags		= 0;
-			flags		|= DS_ROLE_PRIMARY_DS_RUNNING;
-			flags		|= DS_ROLE_PRIMARY_DS_MIXED_MODE;
-			flags		|= DS_ROLE_PRIMARY_DOMAIN_GUID_PRESENT;
+			flags		= DS_ROLE_PRIMARY_DS_RUNNING;
+
+			if (samdb_result_uint(res[0], "nTMixedDomain", 0) == 1) {
+				flags		|= DS_ROLE_PRIMARY_DS_MIXED_MODE;
+			}
+
 			domain		= samdb_result_string(res[0], "name", NULL);
 			dns_domain	= samdb_result_string(res[0], "dnsDomain", NULL);
 			forest		= samdb_result_string(res[0], "dnsDomain", NULL);
+
+			flags		|= DS_ROLE_PRIMARY_DOMAIN_GUID_PRESENT;
 			domain_guid	= samdb_result_guid(res[0], "objectGUID");
 			break;
 		}