mirror of
https://github.com/samba-team/samba.git
synced 2025-01-27 14:04:05 +03:00
Remove unused marshalling for NET_SAM_SYNC.
Guenther
This commit is contained in:
Günther Deschner
parent
f53393677d
commit
a94d93725a
@ -467,30 +467,6 @@ typedef struct net_r_sam_logoff_info {
|
||||
NTSTATUS status; /* return code */
|
||||
} NET_R_SAM_LOGOFF;
|
||||
|
||||
/* NET_Q_SAM_SYNC */
|
||||
typedef struct net_q_sam_sync_info {
|
||||
UNISTR2 uni_srv_name; /* \\PDC */
|
||||
UNISTR2 uni_cli_name; /* BDC */
|
||||
DOM_CRED cli_creds;
|
||||
DOM_CRED ret_creds;
|
||||
|
||||
uint32 database_id;
|
||||
uint32 restart_state;
|
||||
uint32 sync_context;
|
||||
|
||||
uint32 max_size; /* preferred maximum length */
|
||||
} NET_Q_SAM_SYNC;
|
||||
|
||||
/* SAM_DELTA_HDR */
|
||||
typedef struct sam_delta_hdr_info {
|
||||
uint16 type; /* type of structure attached */
|
||||
uint16 type2;
|
||||
uint32 target_rid;
|
||||
|
||||
uint32 type3;
|
||||
uint32 ptr_delta;
|
||||
} SAM_DELTA_HDR;
|
||||
|
||||
/* LOCKOUT_STRING */
|
||||
typedef struct account_lockout_string {
|
||||
uint32 array_size;
|
||||
@ -510,327 +486,6 @@ typedef struct hdr_account_lockout_string {
|
||||
uint32 buffer;
|
||||
} HDR_LOCKOUT_STRING;
|
||||
|
||||
/* SAM_DOMAIN_INFO (0x1) */
|
||||
typedef struct sam_domain_info_info {
|
||||
UNIHDR hdr_dom_name;
|
||||
UNIHDR hdr_oem_info;
|
||||
|
||||
uint64 force_logoff;
|
||||
uint16 min_pwd_len;
|
||||
uint16 pwd_history_len;
|
||||
uint64 max_pwd_age;
|
||||
uint64 min_pwd_age;
|
||||
uint64 dom_mod_count;
|
||||
NTTIME creation_time;
|
||||
uint32 security_information;
|
||||
|
||||
BUFHDR4 hdr_sec_desc; /* security descriptor */
|
||||
|
||||
HDR_LOCKOUT_STRING hdr_account_lockout;
|
||||
|
||||
UNIHDR hdr_unknown2;
|
||||
UNIHDR hdr_unknown3;
|
||||
UNIHDR hdr_unknown4;
|
||||
|
||||
UNISTR2 uni_dom_name;
|
||||
UNISTR2 buf_oem_info;
|
||||
|
||||
RPC_DATA_BLOB buf_sec_desc;
|
||||
|
||||
LOCKOUT_STRING account_lockout;
|
||||
|
||||
UNISTR2 buf_unknown2;
|
||||
UNISTR2 buf_unknown3;
|
||||
UNISTR2 buf_unknown4;
|
||||
|
||||
uint32 logon_chgpass;
|
||||
uint32 unknown6;
|
||||
uint32 unknown7;
|
||||
uint32 unknown8;
|
||||
} SAM_DOMAIN_INFO;
|
||||
|
||||
/* SAM_GROUP_INFO (0x2) */
|
||||
typedef struct sam_group_info_info {
|
||||
UNIHDR hdr_grp_name;
|
||||
DOM_GID gid;
|
||||
UNIHDR hdr_grp_desc;
|
||||
BUFHDR2 hdr_sec_desc; /* security descriptor */
|
||||
uint8 reserved[48];
|
||||
|
||||
UNISTR2 uni_grp_name;
|
||||
UNISTR2 uni_grp_desc;
|
||||
RPC_DATA_BLOB buf_sec_desc;
|
||||
} SAM_GROUP_INFO;
|
||||
|
||||
/* SAM_PWD */
|
||||
typedef struct sam_passwd_info {
|
||||
/* this structure probably contains password history */
|
||||
/* this is probably a count of lm/nt pairs */
|
||||
uint32 unk_0; /* 0x0000 0002 */
|
||||
|
||||
UNIHDR hdr_lm_pwd;
|
||||
uint8 buf_lm_pwd[16];
|
||||
|
||||
UNIHDR hdr_nt_pwd;
|
||||
uint8 buf_nt_pwd[16];
|
||||
|
||||
UNIHDR hdr_empty_lm;
|
||||
UNIHDR hdr_empty_nt;
|
||||
} SAM_PWD;
|
||||
|
||||
/* SAM_ACCOUNT_INFO (0x5) */
|
||||
typedef struct sam_account_info_info {
|
||||
UNIHDR hdr_acct_name;
|
||||
UNIHDR hdr_full_name;
|
||||
|
||||
uint32 user_rid;
|
||||
uint32 group_rid;
|
||||
|
||||
UNIHDR hdr_home_dir;
|
||||
UNIHDR hdr_dir_drive;
|
||||
UNIHDR hdr_logon_script;
|
||||
UNIHDR hdr_acct_desc;
|
||||
UNIHDR hdr_workstations;
|
||||
|
||||
NTTIME logon_time;
|
||||
NTTIME logoff_time;
|
||||
|
||||
uint32 logon_divs; /* 0xA8 */
|
||||
uint32 ptr_logon_hrs;
|
||||
|
||||
uint16 bad_pwd_count;
|
||||
uint16 logon_count;
|
||||
NTTIME pwd_last_set_time;
|
||||
NTTIME acct_expiry_time;
|
||||
|
||||
uint32 acb_info;
|
||||
uint8 nt_pwd[16];
|
||||
uint8 lm_pwd[16];
|
||||
uint8 nt_pwd_present;
|
||||
uint8 lm_pwd_present;
|
||||
uint8 pwd_expired;
|
||||
|
||||
UNIHDR hdr_comment;
|
||||
UNIHDR hdr_parameters;
|
||||
uint16 country;
|
||||
uint16 codepage;
|
||||
|
||||
BUFHDR2 hdr_sec_desc; /* security descriptor */
|
||||
|
||||
UNIHDR hdr_profile;
|
||||
UNIHDR hdr_reserved[3]; /* space for more strings */
|
||||
uint32 dw_reserved[4]; /* space for more data - first two seem to
|
||||
be an NTTIME */
|
||||
|
||||
UNISTR2 uni_acct_name;
|
||||
UNISTR2 uni_full_name;
|
||||
UNISTR2 uni_home_dir;
|
||||
UNISTR2 uni_dir_drive;
|
||||
UNISTR2 uni_logon_script;
|
||||
UNISTR2 uni_acct_desc;
|
||||
UNISTR2 uni_workstations;
|
||||
|
||||
uint32 unknown1; /* 0x4EC */
|
||||
uint32 unknown2; /* 0 */
|
||||
|
||||
RPC_DATA_BLOB buf_logon_hrs;
|
||||
UNISTR2 uni_comment;
|
||||
UNISTR2 uni_parameters;
|
||||
SAM_PWD pass;
|
||||
RPC_DATA_BLOB buf_sec_desc;
|
||||
UNISTR2 uni_profile;
|
||||
} SAM_ACCOUNT_INFO;
|
||||
|
||||
/* SAM_GROUP_MEM_INFO (0x8) */
|
||||
typedef struct sam_group_mem_info_info {
|
||||
uint32 ptr_rids;
|
||||
uint32 ptr_attribs;
|
||||
uint32 num_members;
|
||||
uint8 unknown[16];
|
||||
|
||||
uint32 num_members2;
|
||||
uint32 *rids;
|
||||
|
||||
uint32 num_members3;
|
||||
uint32 *attribs;
|
||||
|
||||
} SAM_GROUP_MEM_INFO;
|
||||
|
||||
/* SAM_ALIAS_INFO (0x9) */
|
||||
typedef struct sam_alias_info_info {
|
||||
UNIHDR hdr_als_name;
|
||||
uint32 als_rid;
|
||||
BUFHDR2 hdr_sec_desc; /* security descriptor */
|
||||
UNIHDR hdr_als_desc;
|
||||
uint8 reserved[40];
|
||||
|
||||
UNISTR2 uni_als_name;
|
||||
RPC_DATA_BLOB buf_sec_desc;
|
||||
UNISTR2 uni_als_desc;
|
||||
} SAM_ALIAS_INFO;
|
||||
|
||||
/* SAM_ALIAS_MEM_INFO (0xC) */
|
||||
typedef struct sam_alias_mem_info_info {
|
||||
uint32 num_members;
|
||||
uint32 ptr_members;
|
||||
uint8 unknown[16];
|
||||
|
||||
uint32 num_sids;
|
||||
uint32 *ptr_sids;
|
||||
DOM_SID2 *sids;
|
||||
} SAM_ALIAS_MEM_INFO;
|
||||
|
||||
|
||||
/* SAM_DELTA_POLICY (0x0D) */
|
||||
typedef struct {
|
||||
uint32 max_log_size; /* 0x5000 */
|
||||
uint64 audit_retention_period; /* 0 */
|
||||
uint32 auditing_mode; /* 0 */
|
||||
uint32 num_events;
|
||||
uint32 ptr_events;
|
||||
UNIHDR hdr_dom_name;
|
||||
uint32 sid_ptr;
|
||||
|
||||
uint32 paged_pool_limit; /* 0x02000000 */
|
||||
uint32 non_paged_pool_limit; /* 0x00100000 */
|
||||
uint32 min_workset_size; /* 0x00010000 */
|
||||
uint32 max_workset_size; /* 0x0f000000 */
|
||||
uint32 page_file_limit; /* 0 */
|
||||
uint64 time_limit; /* 0 */
|
||||
NTTIME modify_time; /* 0x3c*/
|
||||
NTTIME create_time; /* a7080110 */
|
||||
BUFHDR2 hdr_sec_desc;
|
||||
|
||||
uint32 num_event_audit_options;
|
||||
uint32 event_audit_option;
|
||||
|
||||
UNISTR2 domain_name;
|
||||
DOM_SID2 domain_sid;
|
||||
|
||||
RPC_DATA_BLOB buf_sec_desc;
|
||||
} SAM_DELTA_POLICY;
|
||||
|
||||
/* SAM_DELTA_TRUST_DOMS */
|
||||
typedef struct {
|
||||
uint32 buf_size;
|
||||
SEC_DESC *sec_desc;
|
||||
DOM_SID2 sid;
|
||||
UNIHDR hdr_domain;
|
||||
|
||||
uint32 unknown0;
|
||||
uint32 unknown1;
|
||||
uint32 unknown2;
|
||||
|
||||
uint32 buf_size2;
|
||||
uint32 ptr;
|
||||
|
||||
uint32 unknown3;
|
||||
UNISTR2 domain;
|
||||
} SAM_DELTA_TRUSTDOMS;
|
||||
|
||||
/* SAM_DELTA_PRIVS (0x10) */
|
||||
typedef struct {
|
||||
DOM_SID2 sid;
|
||||
|
||||
uint32 priv_count;
|
||||
uint32 priv_control;
|
||||
|
||||
uint32 priv_attr_ptr;
|
||||
uint32 priv_name_ptr;
|
||||
|
||||
uint32 paged_pool_limit; /* 0x02000000 */
|
||||
uint32 non_paged_pool_limit; /* 0x00100000 */
|
||||
uint32 min_workset_size; /* 0x00010000 */
|
||||
uint32 max_workset_size; /* 0x0f000000 */
|
||||
uint32 page_file_limit; /* 0 */
|
||||
uint64 time_limit; /* 0 */
|
||||
uint32 system_flags; /* 1 */
|
||||
BUFHDR2 hdr_sec_desc;
|
||||
|
||||
uint32 buf_size2;
|
||||
|
||||
uint32 attribute_count;
|
||||
uint32 *attributes;
|
||||
|
||||
uint32 privlist_count;
|
||||
UNIHDR *hdr_privslist;
|
||||
UNISTR2 *uni_privslist;
|
||||
|
||||
RPC_DATA_BLOB buf_sec_desc;
|
||||
} SAM_DELTA_PRIVS;
|
||||
|
||||
/* SAM_DELTA_SECRET */
|
||||
typedef struct {
|
||||
uint32 buf_size;
|
||||
SEC_DESC *sec_desc;
|
||||
UNISTR2 secret;
|
||||
|
||||
uint32 count1;
|
||||
uint32 count2;
|
||||
uint32 ptr;
|
||||
NTTIME time1;
|
||||
uint32 count3;
|
||||
uint32 count4;
|
||||
uint32 ptr2;
|
||||
NTTIME time2;
|
||||
uint32 unknow1;
|
||||
|
||||
uint32 buf_size2;
|
||||
uint32 ptr3;
|
||||
uint32 unknow2; /* 0x0 12 times */
|
||||
|
||||
uint32 chal_len;
|
||||
uint32 reserved1; /* 0 */
|
||||
uint32 chal_len2;
|
||||
uint8 chal[16];
|
||||
|
||||
uint32 key_len;
|
||||
uint32 reserved2; /* 0 */
|
||||
uint32 key_len2;
|
||||
uint8 key[8];
|
||||
|
||||
uint32 buf_size3;
|
||||
SEC_DESC *sec_desc2;
|
||||
} SAM_DELTA_SECRET;
|
||||
|
||||
/* SAM_DELTA_MOD_COUNT (0x16) */
|
||||
typedef struct {
|
||||
uint32 seqnum;
|
||||
uint32 dom_mod_count_ptr;
|
||||
uint64 dom_mod_count; /* domain mod count at last sync */
|
||||
} SAM_DELTA_MOD_COUNT;
|
||||
|
||||
typedef union sam_delta_ctr_info {
|
||||
SAM_DOMAIN_INFO domain_info ;
|
||||
SAM_GROUP_INFO group_info ;
|
||||
SAM_ACCOUNT_INFO account_info;
|
||||
SAM_GROUP_MEM_INFO grp_mem_info;
|
||||
SAM_ALIAS_INFO alias_info ;
|
||||
SAM_ALIAS_MEM_INFO als_mem_info;
|
||||
SAM_DELTA_POLICY policy_info;
|
||||
SAM_DELTA_PRIVS privs_info;
|
||||
SAM_DELTA_MOD_COUNT mod_count;
|
||||
SAM_DELTA_TRUSTDOMS trustdoms_info;
|
||||
SAM_DELTA_SECRET secret_info;
|
||||
} SAM_DELTA_CTR;
|
||||
|
||||
/* NET_R_SAM_SYNC */
|
||||
typedef struct net_r_sam_sync_info {
|
||||
DOM_CRED srv_creds;
|
||||
|
||||
uint32 sync_context;
|
||||
|
||||
uint32 ptr_deltas;
|
||||
uint32 num_deltas;
|
||||
uint32 ptr_deltas2;
|
||||
uint32 num_deltas2;
|
||||
|
||||
SAM_DELTA_HDR *hdr_deltas;
|
||||
SAM_DELTA_CTR *deltas;
|
||||
|
||||
NTSTATUS status;
|
||||
} NET_R_SAM_SYNC;
|
||||
|
||||
#define DSGETDC_VALID_FLAGS ( \
|
||||
DS_FORCE_REDISCOVERY | \
|
||||
DS_DIRECTORY_SERVICE_REQUIRED | \
|
||||
|
||||
@ -347,59 +347,6 @@ NTSTATUS rpccli_netlogon_setup_creds(struct rpc_pipe_client *cli,
|
||||
return NT_STATUS_OK;
|
||||
}
|
||||
|
||||
/* Sam synchronisation */
|
||||
|
||||
NTSTATUS rpccli_netlogon_sam_sync(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
|
||||
uint32 database_id, uint32 next_rid, uint32 *num_deltas,
|
||||
SAM_DELTA_HDR **hdr_deltas,
|
||||
SAM_DELTA_CTR **deltas)
|
||||
{
|
||||
prs_struct qbuf, rbuf;
|
||||
NET_Q_SAM_SYNC q;
|
||||
NET_R_SAM_SYNC r;
|
||||
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
|
||||
DOM_CRED clnt_creds;
|
||||
DOM_CRED ret_creds;
|
||||
|
||||
ZERO_STRUCT(q);
|
||||
ZERO_STRUCT(r);
|
||||
|
||||
ZERO_STRUCT(ret_creds);
|
||||
|
||||
/* Initialise input parameters */
|
||||
|
||||
creds_client_step(cli->dc, &clnt_creds);
|
||||
|
||||
init_net_q_sam_sync(&q, cli->dc->remote_machine, global_myname(),
|
||||
&clnt_creds, &ret_creds, database_id, next_rid);
|
||||
|
||||
/* Marshall data and send request */
|
||||
|
||||
CLI_DO_RPC_COPY_SESS_KEY(cli, mem_ctx, PI_NETLOGON, NET_SAM_SYNC,
|
||||
q, r,
|
||||
qbuf, rbuf,
|
||||
net_io_q_sam_sync,
|
||||
net_io_r_sam_sync,
|
||||
NT_STATUS_UNSUCCESSFUL);
|
||||
|
||||
/* Return results */
|
||||
|
||||
result = r.status;
|
||||
*num_deltas = r.num_deltas2;
|
||||
*hdr_deltas = r.hdr_deltas;
|
||||
*deltas = r.deltas;
|
||||
|
||||
if (!NT_STATUS_IS_ERR(result)) {
|
||||
/* Check returned credentials. */
|
||||
if (!creds_client_check(cli->dc, &r.srv_creds.challenge)) {
|
||||
DEBUG(0,("cli_netlogon_sam_sync: credentials chain check failed\n"));
|
||||
return NT_STATUS_ACCESS_DENIED;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/* Logon domain user */
|
||||
|
||||
NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user