sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

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

Browse Source 
metze
(This used to be commit 7fe9550375a7a922f9fc93944acaf7915ee107c1)
This commit is contained in:
Stefan Metzmacher 2005-01-02 16:24:05 +00:00 committed by Gerald (Jerry) Carter
parent fa010c9676
commit aa731aceb8
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source4/provision.ldif
View File

@ -66,6 +66,7 @@ pwdProperties: 1
pwdHistoryLength: 24
objectSid: ${DOMAINSID}
serverState: 1
nTMixedDomain: 1
uASCompat: 1
modifiedCount: 1
objectCategory: CN=Domain-DNS,CN=Schema,CN=Configuration,${BASEDN}

14
source4/rpc_server/dssetup/dcesrv_dssetup.c
View File

@ -39,7 +39,7 @@ static WERROR dssetup_DsRoleGetPrimaryDomainInformation(struct dcesrv_call_state
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 @@ static WERROR dssetup_DsRoleGetPrimaryDomainInformation(struct dcesrv_call_state
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;
}