diff options
| author | Luke Leighton <lkcl@samba.org> | 1999-10-21 16:53:50 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 1999-10-21 16:53:50 +0000 |
| commit | 6f9105c853020fde1691a28cd707d6d3f6561b4d (patch) | |
| tree | 0ecbb34e5b647bf7fc7c967abe14e024cad2ff74 /source3/include | |
| parent | 6af79fb09dc17f4d441dac6e29689c4ee9be5aa7 (diff) | |
| download | samba-6f9105c853020fde1691a28cd707d6d3f6561b4d.tar.gz samba-6f9105c853020fde1691a28cd707d6d3f6561b4d.tar.bz2 samba-6f9105c853020fde1691a28cd707d6d3f6561b4d.zip | |
various. debug levels changed. nmbd doesn't need libsmb/clienttrust.c.
samr_lookup_rids() moved to a dynamic memory structure not a
static one limited to 32 RIDs. cli_pipe.c reading wasn't checking
ERRmoredata when DOS error codes negotiated (this terminates
MSRPC code with prejudice).
(This used to be commit 8976eca2db43576c32069dcda017e8777048e007)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 13 | ||||
| -rw-r--r-- | source3/include/rpc_samr.h | 8 |
2 files changed, 13 insertions, 8 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 4027ca7f82..0021367ae0 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -716,6 +716,11 @@ BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp); BOOL cli_message_end(struct cli_state *cli, int grp); BOOL cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail); +/*The following definitions come from libsmb/clienttrust.c */ + +BOOL change_trust_account_password(char *domain, char *remote_machine_list, + uint16 sec_chan); + /*The following definitions come from libsmb/credentials.c */ char *credstr(uchar *cred); @@ -1774,9 +1779,8 @@ BOOL cli_net_sam_logon(struct cli_state *cli, uint16 nt_pipe_fnum, NET_ID_INFO_C NET_USER_INFO_3 *user_info3); BOOL cli_net_sam_logoff(struct cli_state *cli, uint16 nt_pipe_fnum, NET_ID_INFO_CTR *ctr); BOOL cli_net_sam_sync(struct cli_state *cli, uint16 nt_pipe_fnum, uint32 database_id, uint32 *num_deltas, SAM_DELTA_HDR *hdr_deltas, SAM_DELTA_CTR *deltas); -BOOL change_trust_account_password(char *domain, char *remote_machine_list, - uint16 sec_chan); BOOL do_sam_sync(struct cli_state *cli, uchar trust_passwd[16], + const char* srv_name, SAM_DELTA_HDR hdr_deltas[MAX_SAM_DELTAS], SAM_DELTA_CTR deltas [MAX_SAM_DELTAS], uint32 *num_deltas); @@ -1878,7 +1882,7 @@ BOOL get_samr_query_aliasmem(struct cli_state *cli, uint16 fnum, BOOL get_samr_query_userinfo(struct cli_state *cli, uint16 fnum, POLICY_HND *pol_open_domain, uint32 info_level, - uint32 user_rid, void *usr); + uint32 user_rid, SAM_USER_INFO_21 *usr); BOOL get_samr_query_groupinfo(struct cli_state *cli, uint16 fnum, POLICY_HND *pol_open_domain, uint32 info_level, @@ -2629,7 +2633,8 @@ BOOL samr_io_q_lookup_rids(char *desc, SAMR_Q_LOOKUP_RIDS *q_u, prs_struct *ps, BOOL make_samr_r_lookup_rids(SAMR_R_LOOKUP_RIDS *r_u, uint32 num_names, fstring *name, uint8 *type, uint32 status); -BOOL samr_io_r_lookup_rids(char *desc, SAMR_R_LOOKUP_RIDS *r_u, prs_struct *ps, int depth); +BOOL samr_io_r_lookup_rids(char *desc, SAMR_R_LOOKUP_RIDS *r_u, prs_struct *ps, int depth); +void samr_free_r_lookup_rids(SAMR_R_LOOKUP_RIDS *r_u); BOOL make_samr_q_delete_alias(SAMR_Q_DELETE_DOM_ALIAS *q_u, POLICY_HND *hnd); BOOL samr_io_q_delete_alias(char *desc, SAMR_Q_DELETE_DOM_ALIAS *q_u, prs_struct *ps, int depth); BOOL samr_io_r_delete_alias(char *desc, SAMR_R_DELETE_DOM_ALIAS *r_u, prs_struct *ps, int depth); diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h index ddf359b181..cb66081696 100644 --- a/source3/include/rpc_samr.h +++ b/source3/include/rpc_samr.h @@ -1267,7 +1267,7 @@ typedef struct q_samr_lookup_rids_info uint32 ptr; /* 0x0000 0000 - 32 bit unknown */ uint32 num_rids2; /* number of rids being looked up */ - uint32 rid[MAX_LOOKUP_SIDS]; /* domain RIDs being looked up */ + uint32 *rid; /* domain RIDs being looked up */ } SAMR_Q_LOOKUP_RIDS; @@ -1283,14 +1283,14 @@ typedef struct r_samr_lookup_rids_info uint32 ptr_names; /* pointer to aliases */ uint32 num_names2; /* number of aliases being looked up */ - UNIHDR hdr_name[MAX_LOOKUP_SIDS]; /* unicode account name header */ - UNISTR2 uni_name[MAX_LOOKUP_SIDS]; /* unicode account name string */ + UNIHDR *hdr_name; /* unicode account name header */ + UNISTR2 *uni_name; /* unicode account name string */ uint32 num_types1; /* number of users in aliases being looked up */ uint32 ptr_types; /* pointer to users in aliases */ uint32 num_types2; /* number of users in aliases being looked up */ - uint32 type[MAX_LOOKUP_SIDS]; /* SID_ENUM type */ + uint32 *type; /* SID_ENUM type */ uint32 status; |