mirror of
https://github.com/samba-team/samba.git
synced 2025-11-30 20:23:49 +03:00
r5262: Fix server_role in the samr_query_dom_info calls. When we are a BDC we
should not say we are a PDC. Guenther
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
ed61c84581
commit
6cdf3b97de
@@ -2072,6 +2072,7 @@ NTSTATUS _samr_query_dom_info(pipes_struct *p, SAMR_Q_QUERY_DOMAIN_INFO *q_u, SA
|
||||
NTTIME nt_logout;
|
||||
|
||||
uint32 account_policy_temp;
|
||||
uint32 server_role;
|
||||
|
||||
uint32 num_users=0, num_groups=0, num_aliases=0;
|
||||
|
||||
@@ -2136,9 +2137,13 @@ NTSTATUS _samr_query_dom_info(pipes_struct *p, SAMR_Q_QUERY_DOMAIN_INFO *q_u, SA
|
||||
|
||||
unix_to_nt_time_abs(&nt_logout, u_logout);
|
||||
|
||||
server_role = ROLE_DOMAIN_PDC;
|
||||
if (lp_server_role() == ROLE_DOMAIN_BDC)
|
||||
server_role = ROLE_DOMAIN_BDC;
|
||||
|
||||
/* The time call below is to get a sequence number for the sam. FIXME !!! JRA. */
|
||||
init_unk_info2(&ctr->info.inf2, "", lp_workgroup(), global_myname(), (uint32) time(NULL),
|
||||
num_users, num_groups, num_aliases, nt_logout);
|
||||
init_unk_info2(&ctr->info.inf2, lp_serverstring(), lp_workgroup(), global_myname(), time(NULL),
|
||||
num_users, num_groups, num_aliases, nt_logout, server_role);
|
||||
break;
|
||||
case 0x03:
|
||||
pdb_get_account_policy(AP_TIME_TO_LOGOUT, (unsigned int *)&u_logout);
|
||||
@@ -2153,7 +2158,11 @@ NTSTATUS _samr_query_dom_info(pipes_struct *p, SAMR_Q_QUERY_DOMAIN_INFO *q_u, SA
|
||||
init_unk_info6(&ctr->info.inf6);
|
||||
break;
|
||||
case 0x07:
|
||||
init_unk_info7(&ctr->info.inf7);
|
||||
server_role = ROLE_DOMAIN_PDC;
|
||||
if (lp_server_role() == ROLE_DOMAIN_BDC)
|
||||
server_role = ROLE_DOMAIN_BDC;
|
||||
|
||||
init_unk_info7(&ctr->info.inf7, server_role);
|
||||
break;
|
||||
case 0x08:
|
||||
init_unk_info8(&ctr->info.inf8, (uint32) time(NULL));
|
||||
@@ -4546,6 +4555,7 @@ NTSTATUS _samr_unknown_2e(pipes_struct *p, SAMR_Q_UNKNOWN_2E *q_u, SAMR_R_UNKNOW
|
||||
uint32 num_users=0, num_groups=0, num_aliases=0;
|
||||
|
||||
uint32 account_policy_temp;
|
||||
uint32 server_role;
|
||||
|
||||
if ((ctr = TALLOC_ZERO_P(p->mem_ctx, SAM_UNK_CTR)) == NULL)
|
||||
return NT_STATUS_NO_MEMORY;
|
||||
@@ -4607,9 +4617,13 @@ NTSTATUS _samr_unknown_2e(pipes_struct *p, SAMR_Q_UNKNOWN_2E *q_u, SAMR_R_UNKNOW
|
||||
|
||||
unix_to_nt_time_abs(&nt_logout, u_logout);
|
||||
|
||||
server_role = ROLE_DOMAIN_PDC;
|
||||
if (lp_server_role() == ROLE_DOMAIN_BDC)
|
||||
server_role = ROLE_DOMAIN_BDC;
|
||||
|
||||
/* The time call below is to get a sequence number for the sam. FIXME !!! JRA. */
|
||||
init_unk_info2(&ctr->info.inf2, "", lp_workgroup(), global_myname(), (uint32) time(NULL),
|
||||
num_users, num_groups, num_aliases, nt_logout);
|
||||
init_unk_info2(&ctr->info.inf2, lp_serverstring(), lp_workgroup(), global_myname(), time(NULL),
|
||||
num_users, num_groups, num_aliases, nt_logout, server_role);
|
||||
break;
|
||||
case 0x03:
|
||||
pdb_get_account_policy(AP_TIME_TO_LOGOUT, &account_policy_temp);
|
||||
@@ -4626,7 +4640,10 @@ NTSTATUS _samr_unknown_2e(pipes_struct *p, SAMR_Q_UNKNOWN_2E *q_u, SAMR_R_UNKNOW
|
||||
init_unk_info6(&ctr->info.inf6);
|
||||
break;
|
||||
case 0x07:
|
||||
init_unk_info7(&ctr->info.inf7);
|
||||
server_role = ROLE_DOMAIN_PDC;
|
||||
if (lp_server_role() == ROLE_DOMAIN_BDC)
|
||||
server_role = ROLE_DOMAIN_BDC;
|
||||
init_unk_info7(&ctr->info.inf7, server_role);
|
||||
break;
|
||||
case 0x08:
|
||||
init_unk_info8(&ctr->info.inf8, (uint32) time(NULL));
|
||||
|
||||
Reference in New Issue
Block a user