BDC support.

(This used to be commit 2331aa32ab36c3ee5fd8cfbe972e57299939e33d)

2 files changed, 37 insertions, 5 deletions

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 4cea4b6cee..10d2054d1e 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -474,6 +474,7 @@ enum remote_arch_types get_remote_arch(void);
 char *align4(char *q, char *base);
 char *align2(char *q, char *base);
 void out_ascii(FILE *f, unsigned char *buf,int len);
+void out_struct(FILE *f,char *buf1,int len, int per_line);
 void out_data(FILE *f,char *buf1,int len, int per_line);
 void print_asc(int level, unsigned char const *buf,int len);
 void dump_data(int level, const char *buf1, int len);
@@ -1759,7 +1760,10 @@ BOOL cli_net_sam_logoff(struct cli_state *cli, uint16 nt_pipe_fnum, NET_ID_INFO_
 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);
+BOOL do_sam_sync(struct cli_state *cli,
+				SAM_DELTA_HDR hdr_deltas[MAX_SAM_DELTAS],
+				SAM_DELTA_CTR deltas    [MAX_SAM_DELTAS],
+				uint32 *num_deltas);
 
 /*The following definitions come from  rpc_client/cli_pipe.c  */
 
@@ -2247,7 +2251,8 @@ void make_sam_account_info(SAM_ACCOUNT_INFO *info, char *user_name,
 			   char *full_name, uint32 user_rid, uint32 group_rid,
 			   char *home_dir, char *dir_drive, char *logon_script,
 			   char *acct_desc, uint32 acb_info, char *profile);
-void net_io_r_sam_sync(char *desc, NET_R_SAM_SYNC *r_s, prs_struct *ps, int depth);
+void net_io_r_sam_sync(char *desc, uint8 sess_key[16],
+				NET_R_SAM_SYNC *r_s, prs_struct *ps, int depth);
 
 /*The following definitions come from  rpc_parse/parse_prs.c  */
 
@@ -2261,6 +2266,7 @@ void prs_align(prs_struct *ps);
 BOOL prs_grow(prs_struct *ps);
 BOOL prs_uint8(char *name, prs_struct *ps, int depth, uint8 *data8);
 BOOL prs_uint16(char *name, prs_struct *ps, int depth, uint16 *data16);
+BOOL prs_hash1(prs_struct *ps, uint32 offset, uint8 sess_key[16]);
 BOOL prs_uint32(char *name, prs_struct *ps, int depth, uint32 *data32);
 BOOL prs_uint8s(BOOL charmode, char *name, prs_struct *ps, int depth, uint8 *data8s, int len);
 BOOL prs_uint16s(BOOL charmode, char *name, prs_struct *ps, int depth, uint16 *data16s, int len);
@@ -3253,6 +3259,13 @@ void display_at_enum_info(FILE *out_hnd, enum action_type action,
 void display_at_job_info(FILE *out_hnd, enum action_type action,
 		     AT_JOB_INFO *job, fstring command);
 void display_eventlog_eventrecord(FILE *out_hnd, enum action_type action, EVENTLOGRECORD *ev);
+void display_sam_sync_ctr(FILE *out_hnd, enum action_type action,
+				SAM_DELTA_HDR *delta,
+				SAM_DELTA_CTR *ctr);
+void display_sam_sync(FILE *out_hnd, enum action_type action,
+				SAM_DELTA_HDR *deltas,
+				SAM_DELTA_CTR *ctr,
+				uint32 num);
 
 /*The following definitions come from  rpcclient/rpcclient.c  */
 
@@ -3316,7 +3329,7 @@ SMB_BIG_UINT sys_disk_free(char *path,SMB_BIG_UINT *bsize,SMB_BIG_UINT *dfree,SM
 
 BOOL init_dfs_table(void);
 int under_dfs(connection_struct *conn, const char *path,
-				char *local_path, size_t path_len);
+				char *local_path, size_t local_plen);
 
 /*The following definitions come from  smbd/dir.c  */
 
diff --git a/source3/include/rpc_netlogon.h b/source3/include/rpc_netlogon.h
index 2c02e96d18..6e28280dcc 100644
--- a/source3/include/rpc_netlogon.h
+++ b/source3/include/rpc_netlogon.h
@@ -447,6 +447,26 @@ typedef struct sam_group_info_info
 
 } SAM_GROUP_INFO;
 
+/* SAM_PWD */
+typedef struct sam_passwd_info
+{
+	uint32 unk_0; /* 0x0000 0002 */
+
+	UNIHDR hdr_lm_pwd;
+	uint8  buf_lm_pwd[16];
+
+	uint32 ptr_1; 
+
+	UNIHDR hdr_nt_pwd;
+	uint8  buf_nt_pwd[16];
+
+	uint32 ptr_2; 
+	uint32 ptr_3; 
+	uint32 ptr_4; 
+	uint32 ptr_5; 
+
+} SAM_PWD;
+
 /* SAM_ACCOUNT_INFO (0x5) */
 typedef struct sam_account_info_info
 {
@@ -485,7 +505,6 @@ typedef struct sam_account_info_info
 	uint16 country;
 	uint16 codepage;
 
-	BUFHDR2 hdr_priv_data;
 	BUFHDR2 hdr_sec_desc;  /* security descriptor */
 
 	UNIHDR  hdr_profile;
@@ -507,7 +526,7 @@ typedef struct sam_account_info_info
 	BUFFER4 buf_logon_hrs;
 	UNISTR2 uni_comment;
 	UNISTR2 uni_parameters;
-	BUFFER4 buf_priv_data;
+	SAM_PWD pass;
 	BUFFER4 buf_sec_desc;
 	UNISTR2 uni_profile;