diff options
| author | Luke Leighton <lkcl@samba.org> | 2000-03-31 05:34:33 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 2000-03-31 05:34:33 +0000 |
| commit | 339d43caff4bbb4b6a5c171f71787824ab8d876c (patch) | |
| tree | fc80b1c32f553a2adac6eea400e3951968c1e960 | |
| parent | faafacab8e2b4ab65ae7c00ca049c619951f8b46 (diff) | |
| download | samba-339d43caff4bbb4b6a5c171f71787824ab8d876c.tar.gz | |
moving code around to the right places: create_ntlmssp_resp() was in
the wrong place in smbencrypt.c.
| -rw-r--r-- | source/include/lib_smb_proto.h | 200 | ||||
| -rw-r--r-- | source/include/proto.h | 1372 | ||||
| -rw-r--r-- | source/libsmb/clientgen.c | 8 | ||||
| -rw-r--r-- | source/libsmb/smbencrypt.c | 47 | ||||
| -rw-r--r-- | source/rpc_client/cli_pipe_ntlmssp.c | 8 | ||||
| -rw-r--r-- | source/rpc_parse/parse_ntlmssp.c | 326 | ||||
| -rw-r--r-- | source/rpc_parse/parse_prs.c | 2 |
7 files changed, 1016 insertions, 947 deletions
diff --git a/source/include/lib_smb_proto.h b/source/include/lib_smb_proto.h index d0a2d6914eb..410d898a7be 100644 --- a/source/include/lib_smb_proto.h +++ b/source/include/lib_smb_proto.h @@ -23,74 +23,6 @@ void MD5Update(struct MD5Context *ctx, uchar const *buf, unsigned len); void MD5Final(uchar digest[16], struct MD5Context *ctx); void MD5Transform(uint32 buf[4], const uchar inext[64]); -/*The following definitions come from lib/util_hnd.c */ - -struct policy_cache *get_global_hnd_cache(void); -struct policy_cache *init_policy_cache(int num_pol_hnds); -void free_policy_cache(struct policy_cache *cache); -BOOL policy_hnd_set_name(struct policy_cache *cache, - POLICY_HND *hnd, const char *name); -const char *policy_hnd_get_name(struct policy_cache *cache, - const POLICY_HND *hnd); -BOOL dup_policy_hnd(struct policy_cache *cache, - POLICY_HND *hnd, - const POLICY_HND *from); -BOOL register_policy_hnd(struct policy_cache *cache, - const vuser_key *key, - POLICY_HND *hnd, - uint32 access_mask); -BOOL open_policy_hnd(struct policy_cache *cache, - const vuser_key *key, - POLICY_HND *hnd, - uint32 access_mask); -BOOL open_policy_hnd_link(struct policy_cache *cache, - const POLICY_HND *parent_hnd, - POLICY_HND *hnd, - uint32 access_mask); -int find_policy_by_hnd(struct policy_cache *cache, const POLICY_HND *hnd); -BOOL set_policy_state(struct policy_cache *cache, POLICY_HND *hnd, - void(*fn)(void*), void *dev); -void *get_policy_state_info(struct policy_cache *cache, const POLICY_HND *hnd); -BOOL policy_hnd_set_state_type(struct policy_cache *cache, - POLICY_HND *hnd, int type); -int policy_hnd_get_state_type(struct policy_cache *cache, - const POLICY_HND *hnd); -BOOL policy_hnd_check_state_type(struct policy_cache *cache, - const POLICY_HND *hnd, int type); -BOOL close_policy_hnd(struct policy_cache *cache, POLICY_HND *hnd); -BOOL policy_link_key(struct policy_cache *cache, const POLICY_HND *hnd, - POLICY_HND *to); -const vuser_key *get_policy_vuser_key(struct policy_cache *cache, - const POLICY_HND *hnd); -BOOL pol_get_usr_sesskey(struct policy_cache *cache, const POLICY_HND *hnd, - uchar usr_sess_key[16]); - -/*The following definitions come from lib/vuser.c */ - -BOOL is_valid_user_struct(const vuser_key * key); -user_struct *get_valid_user_struct(const vuser_key * key); -void invalidate_vuid(vuser_key * key); -BOOL validated_username(vuser_key * key, char *name, size_t len); -uint16 create_vuid(pid_t pid, - uid_t uid, gid_t gid, - int n_groups, gid_t * groups, - const char *unix_name, - const char *requested_name, - const char *real_name, - BOOL guest, const NET_USER_INFO_3 * info3); -uint16 register_vuid(pid_t pid, uid_t uid, gid_t gid, - const char *unix_name, - const char *requested_name, - BOOL guest, const NET_USER_INFO_3 * info3); -BOOL check_vuser_ok(struct uid_cache *cache, user_struct * vuser, int snum); - -/*The following definitions come from lib/vuser_db.c */ - -BOOL tdb_delete_vuid( const vuser_key *uk); -BOOL tdb_lookup_vuid( const vuser_key *uk, user_struct **usr); -BOOL tdb_store_vuid( const vuser_key *uk, user_struct *usr); -BOOL vuid_init_db(void); - /*The following definitions come from libsmb/clientgen.c */ int cli_set_port(struct cli_state *cli, int port); @@ -263,15 +195,14 @@ void sam_pwd_hash(unsigned int rid, const uchar *in, uchar *out, int forw); /*The following definitions come from libsmb/smbencrypt.c */ void SMBencrypt(uchar * pwrd, uchar * c8, uchar * p24); -void SMBNTencrypt(uchar * pwrd, uchar * c8, uchar * p24); void E_md4hash(uchar * pwrd, uchar * p16); -void lm_owf_genW(const UNISTR2 * pwd, uchar p16[16]); void lm_owf_gen(const char *pwd, uchar p16[16]); -void nt_owf_genW(const UNISTR2 * pwd, uchar nt_p16[16]); void nt_owf_gen(const char *pwd, uchar nt_p16[16]); -void nt_lm_owf_genW(const UNISTR2 * pwd, uchar nt_p16[16], uchar lm_p16[16]); void nt_lm_owf_gen(const char *pwd, uchar nt_p16[16], uchar lm_p16[16]); void SMBOWFencrypt(const uchar pwrd[16], const uchar * c8, uchar p24[24]); +void NTLMSSPOWFencrypt(const uchar pwrd[8], const uchar * ntlmchalresp, + uchar p24[24]); +void SMBNTencrypt(uchar * pwrd, uchar * c8, uchar * p24); void SMBOWFencrypt_ntv2(const uchar kr[16], const uchar * srv_chal, int srv_chal_len, const uchar * cli_chal, int cli_chal_len, @@ -285,18 +216,16 @@ void SMBgenclientchals(char *lm_cli_chal, const char *srv, const char *dom); void ntv2_owf_gen(const uchar owf[16], const char *user_n, const char *domain_n, uchar kr_buf[16]); -void NTLMSSPOWFencrypt(const uchar pwrd[8], const uchar * ntlmchalresp, - uchar p24[24]); +void lm_owf_genW(const UNISTR2 *pwd, uchar p16[16]); +void nt_owf_genW(const UNISTR2 *pwd, uchar nt_p16[16]); +void nt_lm_owf_genW(const UNISTR2 *pwd, uchar nt_p16[16], uchar lm_p16[16]); BOOL make_oem_passwd_hash(uchar data[516], const char *pwrd, int new_pw_len, const uchar old_pw_hash[16], BOOL unicode); BOOL nt_encrypt_string2(STRING2 * out, const STRING2 * in, const uchar * key); BOOL nt_decrypt_string2(STRING2 * out, const STRING2 * in, const uchar * key); -void create_ntlmssp_resp(struct pwd_info *pwd, - char *domain, char *user_name, char *my_name, - uint32 ntlmssp_cli_flgs, prs_struct * auth_resp); BOOL decode_pw_buffer(const char buffer[516], char *new_pwrd, - int new_pwrd_size, uint32 * new_pw_len); + int new_pwrd_size, uint32 *new_pw_len); BOOL encode_pw_buffer(char buffer[516], const char *new_pass, int new_pw_len, BOOL nt_pass_set); @@ -307,6 +236,74 @@ BOOL smb_safe_err_msg(uint8 class, uint32 num, char *ret, size_t len); BOOL smb_safe_errstr(char *inbuf, char *msg, size_t len); char *smb_errstr(char *inbuf); +/*The following definitions come from lib/util_hnd.c */ + +struct policy_cache *get_global_hnd_cache(void); +struct policy_cache *init_policy_cache(int num_pol_hnds); +void free_policy_cache(struct policy_cache *cache); +BOOL policy_hnd_set_name(struct policy_cache *cache, + POLICY_HND *hnd, const char *name); +const char *policy_hnd_get_name(struct policy_cache *cache, + const POLICY_HND *hnd); +BOOL dup_policy_hnd(struct policy_cache *cache, + POLICY_HND *hnd, + const POLICY_HND *from); +BOOL register_policy_hnd(struct policy_cache *cache, + const vuser_key *key, + POLICY_HND *hnd, + uint32 access_mask); +BOOL open_policy_hnd(struct policy_cache *cache, + const vuser_key *key, + POLICY_HND *hnd, + uint32 access_mask); +BOOL open_policy_hnd_link(struct policy_cache *cache, + const POLICY_HND *parent_hnd, + POLICY_HND *hnd, + uint32 access_mask); +int find_policy_by_hnd(struct policy_cache *cache, const POLICY_HND *hnd); +BOOL set_policy_state(struct policy_cache *cache, POLICY_HND *hnd, + void(*fn)(void*), void *dev); +void *get_policy_state_info(struct policy_cache *cache, const POLICY_HND *hnd); +BOOL policy_hnd_set_state_type(struct policy_cache *cache, + POLICY_HND *hnd, int type); +int policy_hnd_get_state_type(struct policy_cache *cache, + const POLICY_HND *hnd); +BOOL policy_hnd_check_state_type(struct policy_cache *cache, + const POLICY_HND *hnd, int type); +BOOL close_policy_hnd(struct policy_cache *cache, POLICY_HND *hnd); +BOOL policy_link_key(struct policy_cache *cache, const POLICY_HND *hnd, + POLICY_HND *to); +const vuser_key *get_policy_vuser_key(struct policy_cache *cache, + const POLICY_HND *hnd); +BOOL pol_get_usr_sesskey(struct policy_cache *cache, const POLICY_HND *hnd, + uchar usr_sess_key[16]); + +/*The following definitions come from lib/vuser.c */ + +BOOL is_valid_user_struct(const vuser_key * key); +user_struct *get_valid_user_struct(const vuser_key * key); +void invalidate_vuid(vuser_key * key); +BOOL validated_username(vuser_key * key, char *name, size_t len); +uint16 create_vuid(pid_t pid, + uid_t uid, gid_t gid, + int n_groups, gid_t * groups, + const char *unix_name, + const char *requested_name, + const char *real_name, + BOOL guest, const NET_USER_INFO_3 * info3); +uint16 register_vuid(pid_t pid, uid_t uid, gid_t gid, + const char *unix_name, + const char *requested_name, + BOOL guest, const NET_USER_INFO_3 * info3); +BOOL check_vuser_ok(struct uid_cache *cache, user_struct * vuser, int snum); + +/*The following definitions come from lib/vuser_db.c */ + +BOOL tdb_delete_vuid( const vuser_key *uk); +BOOL tdb_lookup_vuid( const vuser_key *uk, user_struct **usr); +BOOL tdb_store_vuid( const vuser_key *uk, user_struct *usr); +BOOL vuid_init_db(void); + /*The following definitions come from rpc_parse/parse_creds.c */ BOOL make_creds_unix(CREDS_UNIX *r_u, const char* user_name, @@ -579,25 +576,34 @@ BOOL net_io_r_sam_sync(char *desc, uint8 sess_key[16], /*The following definitions come from rpc_parse/parse_ntlmssp.c */ -BOOL rpc_hdr_ntlmssp_auth_chk(RPC_HDR_AUTH *rai); -BOOL make_rpc_auth_ntlmssp_neg(RPC_AUTH_NTLMSSP_NEG *neg, - uint32 neg_flgs, - fstring myname, fstring domain); -BOOL smb_io_rpc_auth_ntlmssp_neg(char *desc, RPC_AUTH_NTLMSSP_NEG *neg, prs_struct *ps, int depth); -BOOL make_rpc_auth_ntlmssp_chal(RPC_AUTH_NTLMSSP_CHAL *chl, - uint32 neg_flags, - uint8 challenge[8]); -BOOL smb_io_rpc_auth_ntlmssp_chal(char *desc, RPC_AUTH_NTLMSSP_CHAL *chl, prs_struct *ps, int depth); -BOOL make_rpc_auth_ntlmssp_resp(RPC_AUTH_NTLMSSP_RESP *rsp, - uchar lm_resp[24], - uchar *nt_resp, size_t nt_len, - char *domain, char *user, char *wks, - uint32 neg_flags); -BOOL smb_io_rpc_auth_ntlmssp_resp(char *desc, RPC_AUTH_NTLMSSP_RESP *rsp, prs_struct *ps, int depth); -BOOL rpc_auth_ntlmssp_chk(RPC_AUTH_NTLMSSP_CHK *chk, uint32 crc32, uint32 seq_num); -BOOL make_rpc_auth_ntlmssp_chk(RPC_AUTH_NTLMSSP_CHK *chk, - uint32 ver, uint32 crc32, uint32 seq_num); -BOOL smb_io_rpc_auth_ntlmssp_chk(char *desc, RPC_AUTH_NTLMSSP_CHK *chk, prs_struct *ps, int depth); +BOOL rpc_hdr_ntlmssp_auth_chk(RPC_HDR_AUTH * rai); +BOOL make_rpc_auth_ntlmssp_neg(RPC_AUTH_NTLMSSP_NEG * neg, + uint32 neg_flgs, + fstring myname, fstring domain); +BOOL smb_io_rpc_auth_ntlmssp_neg(char *desc, RPC_AUTH_NTLMSSP_NEG * neg, + prs_struct *ps, int depth); +BOOL make_rpc_auth_ntlmssp_chal(RPC_AUTH_NTLMSSP_CHAL * chl, + uint32 neg_flags, uint8 challenge[8]); +BOOL smb_io_rpc_auth_ntlmssp_chal(char *desc, RPC_AUTH_NTLMSSP_CHAL * chl, + prs_struct *ps, int depth); +void create_ntlmssp_resp(const uchar lm_owf[24], const uchar nt_owf[128], + size_t nt_owf_len, + const char *domain, const char *user_name, + const char *my_name, uint32 ntlmssp_cli_flgs, + prs_struct *auth_resp); +BOOL make_rpc_auth_ntlmssp_resp(RPC_AUTH_NTLMSSP_RESP * rsp, + const uchar lm_resp[24], + const uchar * nt_resp, size_t nt_len, + const char *domain, const char *user, + const char *wks, uint32 neg_flags); +BOOL smb_io_rpc_auth_ntlmssp_resp(char *desc, RPC_AUTH_NTLMSSP_RESP * rsp, + prs_struct *ps, int depth); +BOOL rpc_auth_ntlmssp_chk(RPC_AUTH_NTLMSSP_CHK * chk, uint32 crc32, + uint32 seq_num); +BOOL make_rpc_auth_ntlmssp_chk(RPC_AUTH_NTLMSSP_CHK * chk, + uint32 ver, uint32 crc32, uint32 seq_num); +BOOL smb_io_rpc_auth_ntlmssp_chk(char *desc, RPC_AUTH_NTLMSSP_CHK * chk, + prs_struct *ps, int depth); /*The following definitions come from rpc_parse/parse_prs.c */ diff --git a/source/include/proto.h b/source/include/proto.h index ea3491de29e..ac580c22659 100644 --- a/source/include/proto.h +++ b/source/include/proto.h @@ -404,10 +404,278 @@ void CatchChildLeaveStatus(void); int vslprintf(char *str, int n, char *format, va_list ap); +/*The following definitions come from libsmb/clientgen.c */ + +int cli_set_port(struct cli_state *cli, int port); +char *cli_errstr(struct cli_state *cli); +void cli_safe_smb_errstr(struct cli_state *cli, char *msg, size_t len); +BOOL get_safe_rap_errstr(int rap_error, char *err_msg, size_t msglen); +void cli_safe_errstr(struct cli_state *cli, char *err_msg, size_t msglen); +BOOL cli_send_trans(struct cli_state *cli, int trans, + char *name, int pipe_name_len, + int fid, int flags, + uint16 *setup, int lsetup, int msetup, + char *param, int lparam, int mparam, + char *data, int ldata, int mdata); +BOOL cli_api_pipe(struct cli_state *cli, char *pipe_name, int pipe_name_len, + uint16 *setup, uint32 setup_count, uint32 max_setup_count, + char *params, uint32 param_count, uint32 max_param_count, + char *data, uint32 data_count, uint32 max_data_count, + char **rparam, uint32 *rparam_count, + char **rdata, uint32 *rdata_count); +BOOL cli_api(struct cli_state *cli, + char *param, int prcnt, int mprcnt, + char *data, int drcnt, int mdrcnt, + char **rparam, int *rprcnt, + char **rdata, int *rdrcnt); +BOOL cli_NetWkstaUserLogon(struct cli_state *cli,char *user, char *workstation); +BOOL cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32, const char *)); +BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype, + void (*fn)(const char *, uint32, const char *)); +BOOL cli_session_setup_x(struct cli_state *cli, + char *user, + char *pass, int passlen, + char *ntpass, int ntpasslen, + char *user_domain); +BOOL cli_session_setup(struct cli_state *cli, + char *user, + char *pass, int passlen, + char *ntpass, int ntpasslen, + char *user_domain); +BOOL cli_ulogoff(struct cli_state *cli); +BOOL cli_send_tconX(struct cli_state *cli, + char *share, char *dev, char *pass, int passlen); +BOOL cli_tdis(struct cli_state *cli); +BOOL cli_rename(struct cli_state *cli, char *fname_src, char *fname_dst); +BOOL cli_unlink(struct cli_state *cli, char *fname); +BOOL cli_mkdir(struct cli_state *cli, char *dname); +BOOL cli_rmdir(struct cli_state *cli, char *dname); +int cli_nt_create(struct cli_state *cli, const char *fname); +int cli_open(struct cli_state *cli, const char *fname, + int flags, int share_mode); +BOOL cli_close(struct cli_state *cli, int fnum); +BOOL cli_lock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int timeout); +BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int timeout); +size_t cli_read_one(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size); +size_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size, BOOL overlap); +ssize_t cli_write(struct cli_state *cli, + int fnum, uint16 write_mode, + char *buf, off_t offset, size_t size, size_t bytes_left); +BOOL cli_getattrE(struct cli_state *cli, int fd, + uint16 *attr, size_t *size, + time_t *c_time, time_t *a_time, time_t *m_time); +BOOL cli_getatr(struct cli_state *cli, char *fname, + uint16 *attr, size_t *size, time_t *t); +BOOL cli_setatr(struct cli_state *cli, char *fname, uint16 attr, time_t t); +BOOL cli_qpathinfo(struct cli_state *cli, const char *fname, + time_t *c_time, time_t *a_time, time_t *m_time, + size_t *size, uint16 *mode); +BOOL cli_qpathinfo2(struct cli_state *cli, const char *fname, + time_t *c_time, time_t *a_time, time_t *m_time, + time_t *w_time, size_t *size, uint16 *mode, + SMB_INO_T *ino); +BOOL cli_qfileinfo(struct cli_state *cli, int fnum, + uint16 *mode, size_t *size, + time_t *c_time, time_t *a_time, time_t *m_time, + time_t *w_time, SMB_INO_T *ino); +int cli_list(struct cli_state *cli,const char *Mask,uint16 attribute, + void (*fn)(file_info *, const char *)); +BOOL cli_oem_change_password(struct cli_state *cli, const char *user, const char *new_password, + const char *old_password); +BOOL cli_negprot(struct cli_state *cli); +BOOL cli_session_request(struct cli_state *cli, + struct nmb_name *calling, struct nmb_name *called); +BOOL cli_connect(struct cli_state *cli, const char *host, struct in_addr *ip); +void cli_init_creds(struct cli_state *cli, const struct ntuser_creds *usr); +struct cli_state *cli_initialise(struct cli_state *cli); +void cli_close_socket(struct cli_state *cli); +void cli_shutdown(struct cli_state *cli); +int cli_error(struct cli_state *cli, uint8 *eclass, uint32 *num); +void cli_sockopt(struct cli_state *cli, char *options); +uint16 cli_setpid(struct cli_state *cli, uint16 pid); +BOOL cli_reestablish_connection(struct cli_state *cli); +BOOL cli_establish_connection(struct cli_state *cli, + const char *dest_host, struct in_addr *dest_ip, + struct nmb_name *calling, struct nmb_name *called, + char *service, char *service_type, + BOOL do_shutdown, BOOL do_tcon); +BOOL cli_connect_auth(struct cli_state *cli, + const char* desthost, + struct in_addr *dest_ip, + const struct ntuser_creds *usr); +BOOL cli_connect_servers_auth(struct cli_state *cli, + char *p, + const struct ntuser_creds *usr); +BOOL cli_connect_serverlist(struct cli_state *cli, char *p); +int cli_printjob_del(struct cli_state *cli, int job); +int cli_print_queue(struct cli_state *cli, + void (*fn)(struct print_job_info *)); +BOOL cli_chkpath(struct cli_state *cli, char *path); +BOOL cli_message_start(struct cli_state *cli, char *host, char *username, + int *grp); +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); +BOOL get_any_dc_name(const char *domain, char *srv_name); + +/*The following definitions come from libsmb/credentials.c */ + +char *credstr(const uchar *cred); +void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, const char *pass, + uchar session_key[8]); +void cred_create(uchar session_key[8], DOM_CHAL *stor_cred, UTIME timestamp, + DOM_CHAL *cred); +int cred_assert(const DOM_CHAL *cred, uchar session_key[8], + DOM_CHAL *stored_cred, UTIME timestamp); +BOOL clnt_deal_with_creds(uchar sess_key[8], + DOM_CRED *sto_clnt_cred, DOM_CRED *rcv_srv_cred); +BOOL deal_with_creds(uchar sess_key[8], + DOM_CRED *sto_clnt_cred, + const DOM_CRED *rcv_clnt_cred, DOM_CRED *rtn_srv_cred); + +/*The following definitions come from libsmb/namequery.c */ + +BOOL name_status(int fd,char *name,int name_type,BOOL recurse, + struct in_addr to_ip,char *master,char *rname); +struct in_addr *name_query(int fd,const char *name,int name_type, + BOOL bcast,BOOL recurse, + struct in_addr to_ip, int *count); +FILE *startlmhosts(char *fname); +BOOL getlmhostsent( FILE *fp, pstring name, int *name_type, struct in_addr *ipaddr); +void endlmhosts(FILE *fp); +BOOL is_ip_address(const char *name); +BOOL resolve_name(const char *name, struct in_addr *return_ip, int name_type); +BOOL resolve_srv_name(const char* srv_name, fstring dest_host, + struct in_addr *ip); +BOOL find_master_ip(char *group, struct in_addr *master_ip); +BOOL lookup_pdc_name(const char *srcname, const char *domain, struct in_addr *pdc_ip, char *ret_name); +BOOL get_dc_list(char *group, struct in_addr **ip_list, int *count); + +/*The following definitions come from libsmb/nmblib.c */ + +void debug_nmb_packet(struct packet_struct *p); +char *nmb_namestr(struct nmb_name *n); +void nmb_safe_namestr(struct nmb_name *n, char *str, size_t len); +struct packet_struct *copy_packet(struct packet_struct *packet); +void free_packet(struct packet_struct *packet); +struct packet_struct *parse_packet(char *buf,int length, + enum packet_type packet_type); +struct packet_struct *read_packet(int fd,enum packet_type packet_type); +void make_nmb_name( struct nmb_name *n, const char *name, int type); +BOOL nmb_name_equal(struct nmb_name *n1, struct nmb_name *n2); +int build_packet(char *buf, struct packet_struct *p); +BOOL send_packet(struct packet_struct *p); +struct packet_struct *receive_packet(int fd,enum packet_type type,int t); +struct packet_struct *receive_nmb_packet(int fd, int t, int trn_id); +struct packet_struct *receive_dgram_packet(int fd, int t, char *mailslot_name); +BOOL match_mailslot_name(struct packet_struct *p, char *mailslot_name); +void sort_query_replies(char *data, int n, struct in_addr ip); +char *dns_to_netbios_name(char *dns_name); +int name_mangle( char *In, char *Out, char name_type ); +int name_extract(char *buf,int ofs,char *name); +int name_len(char *s1); + +/*The following definitions come from libsmb/nterr.c */ + +BOOL get_safe_nt_error_msg(uint32 nt_code, char *msg, size_t len); +const char *get_nt_error_msg(uint32 nt_code); + +/*The following definitions come from libsmb/passchange.c */ + +BOOL remote_password_change(const char *remote_machine, const char *user_name, + const char *old_passwd, const char *new_passwd, + char *err_str, size_t err_str_len); + +/*The following definitions come from libsmb/pwd_cache.c */ + +void pwd_init(struct pwd_info *pwd); +BOOL pwd_is_nullpwd(const struct pwd_info *pwd); +BOOL pwd_compare(const struct pwd_info *pwd1, const struct pwd_info *pwd2); +void pwd_read(struct pwd_info *pwd, char *passwd_report, BOOL do_encrypt); +void pwd_set_nullpwd(struct pwd_info *pwd); +void pwd_set_cleartext(struct pwd_info *pwd, char *clr); +void pwd_get_cleartext(struct pwd_info *pwd, char *clr); +void pwd_set_lm_nt_16(struct pwd_info *pwd, + const uchar lm_pwd[16], + const uchar nt_pwd[16]); +void pwd_get_lm_nt_16(const struct pwd_info *pwd, uchar lm_pwd[16], uchar nt_pwd[16]); +void pwd_make_lm_nt_16(struct pwd_info *pwd, char *clr); +void pwd_make_lm_nt_owf2(struct pwd_info *pwd, const uchar srv_key[8], + const char *user, const char *server, const char *domain, + uchar sess_key[16]); +void pwd_make_lm_nt_owf(struct pwd_info *pwd, uchar cryptkey[8], + uchar sess_key[16]); +void pwd_get_lm_nt_owf(struct pwd_info *pwd, uchar lm_owf[24], + uchar *nt_owf, size_t *nt_owf_len); + /*The following definitions come from lib/smbrun.c */ int smbrun(char *cmd,char *outfile,BOOL shared); +/*The following definitions come from libsmb/smbdes.c */ + +void smbhash(uchar *out, const uchar *in, const uchar *key, int forw); +void E_P16(uchar *p14,uchar *p16); +void E_P24(const uchar *p21, const uchar *c8, uchar *p24); +void D_P16(const uchar *p14, const uchar *in, uchar *out); +void E_old_pw_hash( const uchar *p14, const uchar *in, uchar *out); +void cred_hash1(uchar *out, const uchar *in, const uchar *key); +void cred_hash2(uchar *out,uchar *in,uchar *key); +void cred_hash3(uchar *out, const uchar *in,uchar *key, int forw); +void SamOEMhash( uchar *data, const uchar *key, int val); +void sam_pwd_hash(unsigned int rid, const uchar *in, uchar *out, int forw); + +/*The following definitions come from libsmb/smbencrypt.c */ + +void SMBencrypt(uchar * pwrd, uchar * c8, uchar * p24); +void E_md4hash(uchar * pwrd, uchar * p16); +void lm_owf_gen(const char *pwd, uchar p16[16]); +void nt_owf_gen(const char *pwd, uchar nt_p16[16]); +void nt_lm_owf_gen(const char *pwd, uchar nt_p16[16], uchar lm_p16[16]); +void SMBOWFencrypt(const uchar pwrd[16], const uchar * c8, uchar p24[24]); +void NTLMSSPOWFencrypt(const uchar pwrd[8], const uchar * ntlmchalresp, + uchar p24[24]); +void SMBNTencrypt(uchar * pwrd, uchar * c8, uchar * p24); +void SMBOWFencrypt_ntv2(const uchar kr[16], + const uchar * srv_chal, int srv_chal_len, + const uchar * cli_chal, int cli_chal_len, + char resp_buf[16]); +void SMBsesskeygen_ntv2(const uchar kr[16], + const uchar * nt_resp, char sess_key[16]); +void SMBsesskeygen_ntv1(const uchar kr[16], + const uchar * nt_resp, char sess_key[16]); +void SMBgenclientchals(char *lm_cli_chal, + char *nt_cli_chal, int *nt_cli_chal_len, + const char *srv, const char *dom); +void ntv2_owf_gen(const uchar owf[16], + const char *user_n, const char *domain_n, uchar kr_buf[16]); +void lm_owf_genW(const UNISTR2 *pwd, uchar p16[16]); +void nt_owf_genW(const UNISTR2 *pwd, uchar nt_p16[16]); +void nt_lm_owf_genW(const UNISTR2 *pwd, uchar nt_p16[16], uchar lm_p16[16]); +BOOL make_oem_passwd_hash(uchar data[516], + const char *pwrd, int new_pw_len, + const uchar old_pw_hash[16], BOOL unicode); +BOOL nt_encrypt_string2(STRING2 * out, const STRING2 * in, const uchar * key); +BOOL nt_decrypt_string2(STRING2 * out, const STRING2 * in, const uchar * key); +BOOL decode_pw_buffer(const char buffer[516], char *new_pwrd, + int new_pwrd_size, uint32 *new_pw_len); +BOOL encode_pw_buffer(char buffer[516], const char *new_pass, + int new_pw_len, BOOL nt_pass_set); + +/*The following definitions come from libsmb/smberr.c */ + +char *smb_err_msg(uint8 class, uint32 num); +BOOL smb_safe_err_msg(uint8 class, uint32 num, char *ret, size_t len); +BOOL smb_safe_errstr(char *inbuf, char *msg, size_t len); +char *smb_errstr(char *inbuf); + +/*The following definitions come from libsmb/unexpected.c */ + +void unexpected_packet(struct packet_struct *p); +void clear_unexpected(time_t t); +struct packet_struct *receive_unexpected(enum packet_type packet_type, int id, + char *mailslot_name); + /*The following definitions come from lib/snprintf.c */ @@ -417,11 +685,6 @@ void become_root(BOOL save_dir); void unbecome_root(BOOL restore_dir); const vuser_key *get_sec_ctx(void); -/*The following definitions come from lib/surs.c */ - -BOOL surs_sam_sid_to_unixid(DOM_SID *sid, uint32 type, uint32 *id, BOOL create); -BOOL surs_unixid_to_sam_sid(uint32 id, uint32 type, DOM_SID *sid, BOOL create); - /*The following definitions come from lib/sursalgdomonly.c */ BOOL surs_algdomonly_sam_sid_to_unixid(DOM_SID *sid, uint32 type, uint32 *id, @@ -436,6 +699,11 @@ BOOL surs_nt5ldap_sam_sid_to_unixid(LDAPDB *hds, DOM_SID * sid, uint32 type, BOOL surs_nt5ldap_unixid_to_sam_sid(LDAPDB *hds, uint32 id, uint32 type, DOM_SID * sid, BOOL create); +/*The following definitions come from lib/surs.c */ + +BOOL surs_sam_sid_to_unixid(DOM_SID *sid, uint32 type, uint32 *id, BOOL create); +BOOL surs_unixid_to_sam_sid(uint32 id, uint32 type, DOM_SID *sid, BOOL create); + /*The following definitions come from lib/surstdb.c */ BOOL surs_tdb_sam_sid_to_unixid(DOM_SID * sid, uint32 type, uint32 * id, @@ -513,6 +781,25 @@ const struct passwd *Get_Pwnam(char *user,BOOL allow_change); BOOL user_ok(char *user,int snum); BOOL user_in_list(char *user,char *list); +/*The following definitions come from lib/util_array.c */ + +void free_void_array(uint32 num_entries, void **entries, + void(free_item)(void*)); +void* add_copy_to_array(uint32 *len, void ***array, const void *item, + void*(item_dup)(const void*), BOOL alloc_anyway); +void* add_item_to_array(uint32 *len, void ***array, void *item); +void free_use_info_array(uint32 num_entries, struct use_info **entries); +struct use_info* add_use_info_to_array(uint32 *len, struct use_info ***array, + const struct use_info *name); +void free_char_array(uint32 num_entries, char **entries); +char* add_chars_to_array(uint32 *len, char ***array, const char *name); +void free_uint32_array(uint32 num_entries, uint32 **entries); +uint32* add_uint32s_to_array(uint32 *len, uint32 ***array, const uint32 *name); +void free_unistr_array(uint32 num_entries, UNISTR2 **entries); +UNISTR2* add_unistr_to_array(uint32 *len, UNISTR2 ***array, UNISTR2 *name); +void free_sid_array(uint32 num_entries, DOM_SID **entries); +DOM_SID* add_sid_to_array(uint32 *len, DOM_SID ***array, const DOM_SID *sid); + /*The following definitions come from lib/util.c */ BOOL init_myworkgroup(void); @@ -621,25 +908,6 @@ char *passdb_path(char *name); char *lock_path(char *name); const char *get_sid_name_use_str(uint32 sid_name_use); -/*The following definitions come from lib/util_array.c */ - -void free_void_array(uint32 num_entries, void **entries, - void(free_item)(void*)); -void* add_copy_to_array(uint32 *len, void ***array, const void *item, - void*(item_dup)(const void*), BOOL alloc_anyway); -void* add_item_to_array(uint32 *len, void ***array, void *item); -void free_use_info_array(uint32 num_entries, struct use_info **entries); -struct use_info* add_use_info_to_array(uint32 *len, struct use_info ***array, - const struct use_info *name); -void free_char_array(uint32 num_entries, char **entries); -char* add_chars_to_array(uint32 *len, char ***array, const char *name); -void free_uint32_array(uint32 num_entries, uint32 **entries); -uint32* add_uint32s_to_array(uint32 *len, uint32 ***array, const uint32 *name); -void free_unistr_array(uint32 num_entries, UNISTR2 **entries); -UNISTR2* add_unistr_to_array(uint32 *len, UNISTR2 ***array, UNISTR2 *name); -void free_sid_array(uint32 num_entries, DOM_SID **entries); -DOM_SID* add_sid_to_array(uint32 *len, DOM_SID ***array, const DOM_SID *sid); - /*The following definitions come from lib/util_file.c */ BOOL do_file_lock(int fd, int waitsecs, int type); @@ -878,277 +1146,6 @@ BOOL tdb_lookup_vuid( const vuser_key *uk, user_struct **usr); BOOL tdb_store_vuid( const vuser_key *uk, user_struct *usr); BOOL vuid_init_db(void); -/*The following definitions come from libsmb/clientgen.c */ - -int cli_set_port(struct cli_state *cli, int port); -char *cli_errstr(struct cli_state *cli); -void cli_safe_smb_errstr(struct cli_state *cli, char *msg, size_t len); -BOOL get_safe_rap_errstr(int rap_error, char *err_msg, size_t msglen); -void cli_safe_errstr(struct cli_state *cli, char *err_msg, size_t msglen); -BOOL cli_send_trans(struct cli_state *cli, int trans, - char *name, int pipe_name_len, - int fid, int flags, - uint16 *setup, int lsetup, int msetup, - char *param, int lparam, int mparam, - char *data, int ldata, int mdata); -BOOL cli_api_pipe(struct cli_state *cli, char *pipe_name, int pipe_name_len, - uint16 *setup, uint32 setup_count, uint32 max_setup_count, - char *params, uint32 param_count, uint32 max_param_count, - char *data, uint32 data_count, uint32 max_data_count, - char **rparam, uint32 *rparam_count, - char **rdata, uint32 *rdata_count); -BOOL cli_api(struct cli_state *cli, - char *param, int prcnt, int mprcnt, - char *data, int drcnt, int mdrcnt, - char **rparam, int *rprcnt, - char **rdata, int *rdrcnt); -BOOL cli_NetWkstaUserLogon(struct cli_state *cli,char *user, char *workstation); -BOOL cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32, const char *)); -BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype, - void (*fn)(const char *, uint32, const char *)); -BOOL cli_session_setup_x(struct cli_state *cli, - char *user, - char *pass, int passlen, - char *ntpass, int ntpasslen, - char *user_domain); -BOOL cli_session_setup(struct cli_state *cli, - char *user, - char *pass, int passlen, - char *ntpass, int ntpasslen, - char *user_domain); -BOOL cli_ulogoff(struct cli_state *cli); -BOOL cli_send_tconX(struct cli_state *cli, - char *share, char *dev, char *pass, int passlen); -BOOL cli_tdis(struct cli_state *cli); -BOOL cli_rename(struct cli_state *cli, char *fname_src, char *fname_dst); -BOOL cli_unlink(struct cli_state *cli, char *fname); -BOOL cli_mkdir(struct cli_state *cli, char *dname); -BOOL cli_rmdir(struct cli_state *cli, char *dname); -int cli_nt_create(struct cli_state *cli, const char *fname); -int cli_open(struct cli_state *cli, const char *fname, - int flags, int share_mode); -BOOL cli_close(struct cli_state *cli, int fnum); -BOOL cli_lock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int timeout); -BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int timeout); -size_t cli_read_one(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size); -size_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size, BOOL overlap); -ssize_t cli_write(struct cli_state *cli, - int fnum, uint16 write_mode, - char *buf, off_t offset, size_t size, size_t bytes_left); -BOOL cli_getattrE(struct cli_state *cli, int fd, - uint16 *attr, size_t *size, - time_t *c_time, time_t *a_time, time_t *m_time); -BOOL cli_getatr(struct cli_state *cli, char *fname, - uint16 *attr, size_t *size, time_t *t); -BOOL cli_setatr(struct cli_state *cli, char *fname, uint16 attr, time_t t); -BOOL cli_qpathinfo(struct cli_state *cli, const char *fname, - time_t *c_time, time_t *a_time, time_t *m_time, - size_t *size, uint16 *mode); -BOOL cli_qpathinfo2(struct cli_state *cli, const char *fname, - time_t *c_time, time_t *a_time, time_t *m_time, - time_t *w_time, size_t *size, uint16 *mode, - SMB_INO_T *ino); -BOOL cli_qfileinfo(struct cli_state *cli, int fnum, - uint16 *mode, size_t *size, - time_t *c_time, time_t *a_time, time_t *m_time, - time_t *w_time, SMB_INO_T *ino); -int cli_list(struct cli_state *cli,const char *Mask,uint16 attribute, - void (*fn)(file_info *, const char *)); -BOOL cli_oem_change_password(struct cli_state *cli, const char *user, const char *new_password, - const char *old_password); -BOOL cli_negprot(struct cli_state *cli); -BOOL cli_session_request(struct cli_state *cli, - struct nmb_name *calling, struct nmb_name *called); -BOOL cli_connect(struct cli_state *cli, const char *host, struct in_addr *ip); -void cli_init_creds(struct cli_state *cli, const struct ntuser_creds *usr); -struct cli_state *cli_initialise(struct cli_state *cli); -void cli_close_socket(struct cli_state *cli); -void cli_shutdown(struct cli_state *cli); -int cli_error(struct cli_state *cli, uint8 *eclass, uint32 *num); -void cli_sockopt(struct cli_state *cli, char *options); -uint16 cli_setpid(struct cli_state *cli, uint16 pid); -BOOL cli_reestablish_connection(struct cli_state *cli); -BOOL cli_establish_connection(struct cli_state *cli, - const char *dest_host, struct in_addr *dest_ip, - struct nmb_name *calling, struct nmb_name *called, - char *service, char *service_type, - BOOL do_shutdown, BOOL do_tcon); -BOOL cli_connect_auth(struct cli_state *cli, - const char* desthost, - struct in_addr *dest_ip, - const struct ntuser_creds *usr); -BOOL cli_connect_servers_auth(struct cli_state *cli, - char *p, - const struct ntuser_creds *usr); -BOOL cli_connect_serverlist(struct cli_state *cli, char *p); -int cli_printjob_del(struct cli_state *cli, int job); -int cli_print_queue(struct cli_state *cli, - void (*fn)(struct print_job_info *)); -BOOL cli_chkpath(struct cli_state *cli, char *path); -BOOL cli_message_start(struct cli_state *cli, char *host, char *username, - int *grp); -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); -BOOL get_any_dc_name(const char *domain, char *srv_name); - -/*The following definitions come from libsmb/credentials.c */ - -char *credstr(const uchar *cred); -void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, const char *pass, - uchar session_key[8]); -void cred_create(uchar session_key[8], DOM_CHAL *stor_cred, UTIME timestamp, - DOM_CHAL *cred); -int cred_assert(const DOM_CHAL *cred, uchar session_key[8], - DOM_CHAL *stored_cred, UTIME timestamp); -BOOL clnt_deal_with_creds(uchar sess_key[8], - DOM_CRED *sto_clnt_cred, DOM_CRED *rcv_srv_cred); -BOOL deal_with_creds(uchar sess_key[8], - DOM_CRED *sto_clnt_cred, - const DOM_CRED *rcv_clnt_cred, DOM_CRED *rtn_srv_cred); - -/*The following definitions come from libsmb/namequery.c */ - -BOOL name_status(int fd,char *name,int name_type,BOOL recurse, - struct in_addr to_ip,char *master,char *rname); -struct in_addr *name_query(int fd,const char *name,int name_type, - BOOL bcast,BOOL recurse, - struct in_addr to_ip, int *count); -FILE *startlmhosts(char *fname); -BOOL getlmhostsent( FILE *fp, pstring name, int *name_type, struct in_addr *ipaddr); -void endlmhosts(FILE *fp); -BOOL is_ip_address(const char *name); -BOOL resolve_name(const char *name, struct in_addr *return_ip, int name_type); -BOOL resolve_srv_name(const char* srv_name, fstring dest_host, - struct in_addr *ip); -BOOL find_master_ip(char *group, struct in_addr *master_ip); -BOOL lookup_pdc_name(const char *srcname, const char *domain, struct in_addr *pdc_ip, char *ret_name); -BOOL get_dc_list(char *group, struct in_addr **ip_list, int *count); - -/*The following definitions come from libsmb/nmblib.c */ - -void debug_nmb_packet(struct packet_struct *p); -char *nmb_namestr(struct nmb_name *n); -void nmb_safe_namestr(struct nmb_name *n, char *str, size_t len); -struct packet_struct *copy_packet(struct packet_struct *packet); -void free_packet(struct packet_struct *packet); -struct packet_struct *parse_packet(char *buf,int length, - enum packet_type packet_type); -struct packet_struct *read_packet(int fd,enum packet_type packet_type); -void make_nmb_name( struct nmb_name *n, const char *name, int type); -BOOL nmb_name_equal(struct nmb_name *n1, struct nmb_name *n2); -int build_packet(char *buf, struct packet_struct *p); -BOOL send_packet(struct packet_struct *p); -struct packet_struct *receive_packet(int fd,enum packet_type type,int t); -struct packet_struct *receive_nmb_packet(int fd, int t, int trn_id); -struct packet_struct *receive_dgram_packet(int fd, int t, char *mailslot_name); -BOOL match_mailslot_name(struct packet_struct *p, char *mailslot_name); -void sort_query_replies(char *data, int n, struct in_addr ip); -char *dns_to_netbios_name(char *dns_name); -int name_mangle( char *In, char *Out, char name_type ); -int name_extract(char *buf,int ofs,char *name); -int name_len(char *s1); - -/*The following definitions come from libsmb/nterr.c */ - -BOOL get_safe_nt_error_msg(uint32 nt_code, char *msg, size_t len); -const char *get_nt_error_msg(uint32 nt_code); - -/*The following definitions come from libsmb/passchange.c */ - -BOOL remote_password_change(const char *remote_machine, const char *user_name, - const char *old_passwd, const char *new_passwd, - char *err_str, size_t err_str_len); - -/*The following definitions come from libsmb/pwd_cache.c */ - -void pwd_init(struct pwd_info *pwd); -BOOL pwd_is_nullpwd(const struct pwd_info *pwd); -BOOL pwd_compare(const struct pwd_info *pwd1, const struct pwd_info *pwd2); -void pwd_read(struct pwd_info *pwd, char *passwd_report, BOOL do_encrypt); -void pwd_set_nullpwd(struct pwd_info *pwd); -void pwd_set_cleartext(struct pwd_info *pwd, char *clr); -void pwd_get_cleartext(struct pwd_info *pwd, char *clr); -void pwd_set_lm_nt_16(struct pwd_info *pwd, - const uchar lm_pwd[16], - const uchar nt_pwd[16]); -void pwd_get_lm_nt_16(const struct pwd_info *pwd, uchar lm_pwd[16], uchar nt_pwd[16]); -void pwd_make_lm_nt_16(struct pwd_info *pwd, char *clr); -void pwd_make_lm_nt_owf2(struct pwd_info *pwd, const uchar srv_key[8], - const char *user, const char *server, const char *domain, - uchar sess_key[16]); -void pwd_make_lm_nt_owf(struct pwd_info *pwd, uchar cryptkey[8], - uchar sess_key[16]); -void pwd_get_lm_nt_owf(struct pwd_info *pwd, uchar lm_owf[24], - uchar *nt_owf, size_t *nt_owf_len); - -/*The following definitions come from libsmb/smbdes.c */ - -void smbhash(uchar *out, const uchar *in, const uchar *key, int forw); -void E_P16(uchar *p14,uchar *p16); -void E_P24(const uchar *p21, const uchar *c8, uchar *p24); -void D_P16(const uchar *p14, const uchar *in, uchar *out); -void E_old_pw_hash( const uchar *p14, const uchar *in, uchar *out); -void cred_hash1(uchar *out, const uchar *in, const uchar *key); -void cred_hash2(uchar *out,uchar *in,uchar *key); -void cred_hash3(uchar *out, const uchar *in,uchar *key, int forw); -void SamOEMhash( uchar *data, const uchar *key, int val); -void sam_pwd_hash(unsigned int rid, const uchar *in, uchar *out, int forw); - -/*The following definitions come from libsmb/smbencrypt.c */ - -void SMBencrypt(uchar * pwrd, uchar * c8, uchar * p24); -void SMBNTencrypt(uchar * pwrd, uchar * c8, uchar * p24); -void E_md4hash(uchar * pwrd, uchar * p16); -void lm_owf_genW(const UNISTR2 * pwd, uchar p16[16]); -void lm_owf_gen(const char *pwd, uchar p16[16]); -void nt_owf_genW(const UNISTR2 * pwd, uchar nt_p16[16]); -void nt_owf_gen(const char *pwd, uchar nt_p16[16]); -void nt_lm_owf_genW(const UNISTR2 * pwd, uchar nt_p16[16], uchar lm_p16[16]); -void nt_lm_owf_gen(const char *pwd, uchar nt_p16[16], uchar lm_p16[16]); -void SMBOWFencrypt(const uchar pwrd[16], const uchar * c8, uchar p24[24]); -void SMBOWFencrypt_ntv2(const uchar kr[16], - const uchar * srv_chal, int srv_chal_len, - const uchar * cli_chal, int cli_chal_len, - char resp_buf[16]); -void SMBsesskeygen_ntv2(const uchar kr[16], - const uchar * nt_resp, char sess_key[16]); -void SMBsesskeygen_ntv1(const uchar kr[16], - const uchar * nt_resp, char sess_key[16]); -void SMBgenclientchals(char *lm_cli_chal, - char *nt_cli_chal, int *nt_cli_chal_len, - const char *srv, const char *dom); -void ntv2_owf_gen(const uchar owf[16], - const char *user_n, const char *domain_n, uchar kr_buf[16]); -void NTLMSSPOWFencrypt(const uchar pwrd[8], const uchar * ntlmchalresp, - uchar p24[24]); -BOOL make_oem_passwd_hash(uchar data[516], - const char *pwrd, int new_pw_len, - const uchar old_pw_hash[16], BOOL unicode); -BOOL nt_encrypt_string2(STRING2 * out, const STRING2 * in, const uchar * key); -BOOL nt_decrypt_string2(STRING2 * out, const STRING2 * in, const uchar * key); -void create_ntlmssp_resp(struct pwd_info *pwd, - char *domain, char *user_name, char *my_name, - uint32 ntlmssp_cli_flgs, prs_struct * auth_resp); -BOOL decode_pw_buffer(const char buffer[516], char *new_pwrd, - int new_pwrd_size, uint32 * new_pw_len); -BOOL encode_pw_buffer(char buffer[516], const char *new_pass, - int new_pw_len, BOOL nt_pass_set); - -/*The following definitions come from libsmb/smberr.c */ - -char *smb_err_msg(uint8 class, uint32 num); -BOOL smb_safe_err_msg(uint8 class, uint32 num, char *ret, size_t len); -BOOL smb_safe_errstr(char *inbuf, char *msg, size_t len); -char *smb_errstr(char *inbuf); - -/*The following definitions come from libsmb/unexpected.c */ - -void unexpected_packet(struct packet_struct *p); -void clear_unexpected(time_t t); -struct packet_struct *receive_unexpected(enum packet_type packet_type, int id, - char *mailslot_name); - /*The following definitions come from locking/locking.c */ BOOL is_locked(files_struct *fsp,connection_struct *conn, @@ -1318,9 +1315,6 @@ BOOL queue_dns_query(struct packet_struct *p,struct nmb_name *question, struct name_record **n); void kill_async_dns_child(void); -/*The following definitions come from nmbd/nmbd.c */ - - /*The following definitions come from nmbd/nmbd_become_dmb.c */ void add_domain_names(time_t t); @@ -1351,6 +1345,9 @@ void announce_and_sync_with_domain_master_browser( struct subnet_record *subrec, void collect_all_workgroup_names_from_wins_server(time_t t); void sync_all_dmbs(time_t t); +/*The following definitions come from nmbd/nmbd.c */ + + /*The following definitions come from nmbd/nmbd_elections.c */ void check_master_browser_exists(time_t t); @@ -2122,11 +2119,6 @@ void init_devicemode(NT_DEVICEMODE *nt_devmode); BOOL pcap_printername_ok(char *pszPrintername, char *pszPrintcapname); void pcap_printer_fn(void (*fn)(char *, char *)); -/*The following definitions come from printing/print_svid.c */ - -void sysv_printer_fn(void (*fn)(char *, char *)); -int sysv_printername_ok(char *name); - /*The following definitions come from printing/printing.c */ void lpq_reset(int snum); @@ -2145,6 +2137,11 @@ uint32 status_printqueue(connection_struct *conn,const vuser_key *key, int snum,int status); void load_printers(void); +/*The following definitions come from printing/print_svid.c */ + +void sysv_printer_fn(void (*fn)(char *, char *)); +int sysv_printername_ok(char *name); + /*The following definitions come from profile/profile.c */ BOOL profile_setup(BOOL rdonly); @@ -2616,6 +2613,309 @@ void cli_use_wait_keyboard(void); BOOL wks_query_info( char *srv_name, uint32 switch_value, WKS_INFO_100 *wks100); +/*The following definitions come from rpcclient/cmdat.c */ + + +/*The following definitions come from rpcclient/cmdat_cmds.c */ + +void add_at_commands(void); + +/*The following definitions come from rpcclient/cmd_atsvc.c */ + +void cmd_at(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/cmd_brs.c */ + +void cmd_brs_query_info(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/cmd_dfs.c */ + +void cmd_dfs_add(struct client_info *info, int argc, char *argv[]); +void cmd_dfs_remove(struct client_info *info, int argc, char *argv[]); +void cmd_dfs_enum(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/cmd_eventlog.c */ + +void cmd_eventlog(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/cmd_lsarpc.c */ + +void cmd_lsa_enum_trust_dom(struct client_info *info, int argc, char *argv[]); +void cmd_lsa_query_info(struct client_info *info, int argc, char *argv[]); +void cmd_lsa_lookup_names(struct client_info *info, int argc, char *argv[]); +void cmd_lsa_lookup_sids(struct client_info *info, int argc, char *argv[]); +void cmd_lsa_set_secret(struct client_info *info, int argc, char *argv[]); +void cmd_lsa_create_secret(struct client_info *info, int argc, char *argv[]); +void cmd_lsa_query_secret_secobj(struct client_info *info, int argc, char *argv[]); +void cmd_lsa_query_secret(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/cmd_netlogon.c */ + +void cmd_netlogon_pwset(struct client_info *info, int argc, char *argv[]); +void cmd_netlogon_login_test(struct client_info *info, int argc, char *argv[]); +void cmd_netlogon_domain_test(struct client_info *info, int argc, + char *argv[]); +void cmd_sam_sync(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/cmd_reg.c */ + +void split_server_keyname(char *srv_name, char *key, const char* arg); +BOOL msrpc_reg_enum_key(const char* srv_name, const char* full_keyname, + REG_FN(reg_fn), + REG_KEY_FN(reg_key_fn), + REG_VAL_FN(reg_val_fn)); +void cmd_reg_enum(struct client_info *info, int argc, char *argv[]); +void cmd_reg_query_info(struct client_info *info, int argc, char *argv[]); +void cmd_reg_query_key(struct client_info *info, int argc, char *argv[]); +void cmd_reg_create_val(struct client_info *info, int argc, char *argv[]); +void cmd_reg_delete_val(struct client_info *info, int argc, char *argv[]); +void cmd_reg_delete_key(struct client_info *info, int argc, char *argv[]); +void cmd_reg_create_key(struct client_info *info, int argc, char *argv[]); +void cmd_reg_test_key_sec(struct client_info *info, int argc, char *argv[]); +void cmd_reg_get_key_sec(struct client_info *info, int argc, char *argv[]); +void cmd_reg_shutdown(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/cmd_samr.c */ + +void cmd_sam_ntchange_pwd(struct client_info *info, int argc, char *argv[]); +void cmd_sam_test(struct client_info *info, int argc, char *argv[]); +void cmd_sam_lookup_domain(struct client_info *info, int argc, char *argv[]); +void cmd_sam_lookup_names(struct client_info *info, int argc, char *argv[]); +void cmd_sam_lookup_rids(struct client_info *info, int argc, char *argv[]); +void cmd_sam_del_aliasmem(struct client_info *info, int argc, char *argv[]); +void cmd_sam_delete_dom_alias(struct client_info *info, int argc, + char *argv[]); +void cmd_sam_add_aliasmem(struct client_info *info, int argc, char *argv[]); +void cmd_sam_create_dom_trusting(struct client_info *info, int argc, + char *argv[]); +void cmd_sam_create_dom_user(struct client_info *info, int argc, char *argv[]); +void cmd_sam_create_dom_alias(struct client_info *info, int argc, + char *argv[]); +void cmd_sam_del_groupmem(struct client_info *info, int argc, char *argv[]); +void cmd_sam_delete_dom_user(struct client_info *info, int argc, char *argv[]); +void cmd_sam_delete_dom_group(struct client_info *info, int argc, + char *argv[]); +void cmd_sam_add_groupmem(struct client_info *info, int argc, char *argv[]); +void cmd_sam_create_dom_group(struct client_info *info, int argc, + char *argv[]); +void cmd_sam_enum_users(struct client_info *info, int argc, char *argv[]); +void cmd_sam_query_groupmem(struct client_info *info, int argc, char *argv[]); +void cmd_sam_query_group(struct client_info *info, int argc, char *argv[]); +void cmd_sam_query_sec_obj(struct client_info *info, int argc, char *argv[]); +void cmd_sam_query_user(struct client_info *info, int argc, char *argv[]); +void cmd_sam_set_userinfo2(struct client_info *info, int argc, char *argv[]); +void cmd_sam_set_userinfo(struct client_info *info, int argc, char *argv[]); +void cmd_sam_query_dispinfo(struct client_info *info, int argc, char *argv[]); +void cmd_sam_query_dominfo(struct client_info *info, int argc, char *argv[]); +void cmd_sam_query_aliasmem(struct client_info *info, int argc, char *argv[]); +void cmd_sam_query_alias(struct client_info *info, int argc, char *argv[]); +void cmd_sam_enum_aliases(struct client_info *info, int argc, char *argv[]); +void cmd_sam_enum_groups(struct client_info *info, int argc, char *argv[]); +void cmd_sam_enum_domains(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/cmd_spoolss.c */ + +BOOL msrpc_spoolss_enum_printers(char* srv_name, uint32 flags, uint32 level, PRINTER_INFO_CTR ctr); +void cmd_spoolss_enum_printers(struct client_info *info, int argc, char *argv[]); +void cmd_spoolss_open_printer_ex(struct client_info *info, int argc, char *argv[]); +BOOL msrpc_spoolss_enum_jobs( const char* printer_name, + const char* station, const char* user_name, + uint32 level, + void ***ctr, JOB_INFO_FN(fn)); +void cmd_spoolss_enum_jobs(struct client_info *info, int argc, char *argv[]); +BOOL msrpc_spoolss_enum_printerdata( const char* printer_name, const char* station, const char* user_name ); +void cmd_spoolss_enum_printerdata(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/cmd_srvsvc.c */ + +BOOL net_srv_get_info(struct client_info *info, + uint32 info_level, SRV_INFO_CTR * ctr); +void cmd_srv_query_info(struct client_info *info, int argc, char *argv[]); +BOOL msrpc_srv_enum_tprt(const char *dest_srv, + uint32 info_level, + SRV_TPRT_INFO_CTR * ctr, TPRT_INFO_FN(tprt_fn)); +void cmd_srv_enum_tprt(struct client_info *info, int argc, char *argv[]); +void cmd_srv_enum_conn(struct client_info *info, int argc, char *argv[]); +void cmd_srv_enum_shares(struct client_info *info, int argc, char *argv[]); +void cmd_srv_share_get_info(struct client_info *info, int argc, char *argv[]); +void cmd_srv_enum_sess(struct client_info *info, int argc, char *argv[]); +void cmd_srv_enum_files(struct client_info *info, int argc, char *argv[]); +void cmd_time(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/cmd_svcctl.c */ + +void svc_display_query_svc_cfg(const QUERY_SERVICE_CONFIG *cfg); +BOOL svc_query_service( POLICY_HND *pol_scm, + const char *svc_name, + SVC_QUERY_FN(svc_query_fn)); +void cmd_svc_info(struct client_info *info, int argc, char *argv[]); +BOOL msrpc_svc_enum(const char* srv_name, + ENUM_SRVC_STATUS **svcs, + uint32 *num_svcs, + SVC_INFO_FN(info_fn), + SVC_QUERY_FN(query_fn)); +void cmd_svc_enum(struct client_info *info, int argc, char *argv[]); +void cmd_svc_stop(struct client_info *info, int argc, char *argv[]); +void cmd_svc_start(struct client_info *info, int argc, char *argv[]); +void cmd_svc_set(struct client_info *info, int argc, char *argv[]); +void cmd_svc_unk3(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/cmd_wkssvc.c */ + +void cmd_wks_query_info(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/dfs_cmds.c */ + +char *complete_dfsenum(char *text, int state); +void add_dfs_commands(void); + +/*The following definitions come from rpcclient/display_at.c */ + +void display_at_enum_info(FILE *out_hnd, enum action_type action, + uint32 num_jobs, const AT_ENUM_INFO *const jobs, + char *const *const commands); +void display_at_job_info(FILE *out_hnd, enum action_type action, + AT_JOB_INFO *const job, fstring command); + +/*The following definitions come from rpcclient/display_dfs.c */ + +void display_dfs_enum_1(FILE *hnd, DFS_INFO_CTR *ctr); +void display_dfs_enum_2(FILE *hnd, DFS_INFO_CTR *ctr); +void display_dfs_enum_3_storages(FILE *hnd, DFS_INFO_3 *info3); +void display_dfs_enum_3(FILE *hnd, DFS_INFO_CTR *ctr); +void display_dfs_enum(FILE *hnd, char *srv_name, DFS_INFO_CTR *ctr); + +/*The following definitions come from rpcclient/display_event.c */ + +void display_eventlog_eventrecord(FILE *out_hnd, enum action_type action, EVENTLOGRECORD *const ev); + +/*The following definitions come from rpcclient/display_reg.c */ + +char *get_reg_val_type_str(uint32 type); +void display_reg_value_info(FILE *out_hnd, enum action_type action, + const char *val_name, + uint32 val_type, const BUFFER2 *value); +void display_reg_key_info(FILE *out_hnd, enum action_type action, + const char *key_name, time_t key_mod_time); + +/*The following definitions come from rpcclient/display_sam.c */ + +void display_alias_members(FILE *out_hnd, enum action_type action, + uint32 num_mem, char *const *const sid_mem, + uint32 *const type); +void display_alias_rid_info(FILE *out_hnd, enum action_type action, + DOM_SID *const sid, + uint32 num_rids, uint32 *const rid); +void display_group_members(FILE *out_hnd, enum action_type action, + uint32 num_mem, char *const *const name, uint32 *const type); +void display_group_info_ctr(FILE *out_hnd, enum action_type action, + GROUP_INFO_CTR *const ctr); +void display_group_rid_info(FILE *out_hnd, enum action_type action, + uint32 num_gids, DOM_GID *const gid); +void display_alias_name_info(FILE *out_hnd, enum action_type action, + uint32 num_aliases, fstring *const alias_name, const uint32 *const num_als_usrs); +void display_alias_info_ctr(FILE *out_hnd, enum action_type action, + ALIAS_INFO_CTR *const ctr); +void display_sam_user_info_21(FILE *out_hnd, enum action_type action, SAM_USER_INFO_21 *const usr); +void display_sam_unk_ctr(FILE *out_hnd, enum action_type action, + uint32 switch_value, SAM_UNK_CTR *const ctr); +void display_sam_disp_info_ctr(FILE *out_hnd, enum action_type action, + uint16 level, uint32 count, + SAM_DISPINFO_CTR *const ctr); + +/*The following definitions come from rpcclient/display_sec.c */ + +void display_sec_desc(FILE *out_hnd, enum action_type action, SEC_DESC *const sec); + +/*The following definitions come from rpcclient/display_spool.c */ + +void display_printer_info_ctr(FILE *out_hnd, enum action_type action, uint32 level, + uint32 count, PRINTER_INFO_CTR ctr); +void display_printer_enumdata(FILE *out_hnd, enum action_type action, uint32 idx, + uint32 valuelen, uint16 *value, uint32 rvaluelen, + uint32 type, + uint32 datalen, uint8 *data, uint32 rdatalen); +void display_job_info_2(FILE *out_hnd, enum action_type action, + JOB_INFO_2 *const i2); +void display_job_info_1(FILE *out_hnd, enum action_type action, + JOB_INFO_1 *const i1); +void display_job_info_2_ctr(FILE *out_hnd, enum action_type action, + uint32 count, JOB_INFO_2 *const *const ctr); +void display_job_info_1_ctr(FILE *out_hnd, enum action_type action, + uint32 count, JOB_INFO_1 *const *const ctr); +void display_job_info_ctr(FILE *out_hnd, enum action_type action, + uint32 level, uint32 count, + void *const *const ctr); + +/*The following definitions come from rpcclient/display_srv.c */ + +char *get_file_oplock_str(uint32 op_type); +void display_srv_info_ctr(FILE * out_hnd, enum action_type action, + const SRV_INFO_CTR * ctr); +void display_srv_conn_info_ctr(FILE * out_hnd, enum action_type action, + SRV_CONN_INFO_CTR * const ctr); +void display_tprt_info_0(FILE * out_hnd, enum action_type action, + TPRT_INFO_0 * const info0, + TPRT_INFO_0_STR * const str0); +void display_srv_tprt_info_0_ctr(FILE * out_hnd, enum action_type action, + const SRV_TPRT_INFO_0 * const ctr); +void display_srv_tprt_info_ctr(FILE * out_hnd, enum action_type action, + const SRV_TPRT_INFO_CTR * const ctr); +void display_srv_share_info_ctr(FILE * out_hnd, enum action_type action, + SRV_SHARE_INFO_CTR * const ctr); +void display_share_info_ctr(FILE * out_hnd, enum action_type action, + SHARE_INFO_CTR * const ctr); +void display_srv_file_info_ctr(FILE * out_hnd, enum action_type action, + SRV_FILE_INFO_CTR * const ctr); +void display_srv_sess_info_0_ctr(FILE * out_hnd, enum action_type action, + SRV_SESS_INFO_0 * const ctr); +void display_srv_sess_info_1_ctr(FILE * out_hnd, enum action_type action, + SRV_SESS_INFO_1 * const ctr); +void display_srv_sess_info_ctr(FILE * out_hnd, enum action_type action, + SRV_SESS_INFO_CTR * const ctr); +void display_server(FILE * out_hnd, enum action_type action, + char *const sname, uint32 type, char *const comment); +void display_share(FILE * out_hnd, enum action_type action, + char *const sname, uint32 type, char *const comment); +void display_share2(FILE * out_hnd, enum action_type action, + char *const sname, uint32 type, char *const comment, + uint32 perms, uint32 max_uses, uint32 num_uses, + char *const path, char *const password); +void display_name(FILE * out_hnd, enum action_type action, char *const sname); + +/*The following definitions come from rpcclient/display_svc.c */ + +char *get_svc_start_type_str(uint32 type); +void display_query_svc_cfg(FILE *out_hnd, enum action_type action, + const QUERY_SERVICE_CONFIG *const cfg); +void display_svc_info(FILE *out_hnd, enum action_type action, + const ENUM_SRVC_STATUS *const svc); + +/*The following definitions come from rpcclient/display_sync.c */ + +void display_sam_sync_ctr(FILE *out_hnd, enum action_type action, + SAM_DELTA_HDR *const delta, + SAM_DELTA_CTR *const ctr); +void display_sam_sync(FILE *out_hnd, enum action_type action, + SAM_DELTA_HDR *const deltas, + SAM_DELTA_CTR *const ctr, + uint32 num); + +/*The following definitions come from rpcclient/eventlog.c */ + +int main(int argc, char *argv[]); + +/*The following definitions come from rpcclient/eventlog_cmds.c */ + +void add_evt_commands(void); + +/*The following definitions come from rpcclient/lsa.c */ + + +/*The following definitions come from rpcclient/lsa_cmds.c */ + +void add_lsa_commands(void); + /*The following definitions come from rpc_client/msrpc_lsarpc.c */ uint32 lookup_lsa_names(const char *srv_name, @@ -2872,6 +3172,51 @@ BOOL ncalrpc_l_use_del(const char *pipe_name, void ncalrpc_l_use_enum(uint32 * num_cons, struct use_info ***use); void ncalrpc_use_wait_keyboard(void); +/*The following definitions come from rpcclient/net.c */ + + +/*The following definitions come from rpcclient/net_cmds.c */ + +void add_net_commands(void); + +/*The following definitions come from rpcclient/netlogon_cmds.c */ + +void add_ntl_commands(void); + +/*The following definitions come from rpcclient/regedit.c */ + + +/*The following definitions come from rpcclient/regedit_cmds.c */ + +void add_reg_commands(void); + +/*The following definitions come from rpcclient/rpcclient.c */ + + +/*The following definitions come from rpcclient/samedit.c */ + + +/*The following definitions come from rpcclient/samedit_cmds.c */ + +void add_sam_commands(void); + +/*The following definitions come from rpcclient/spoolss.c */ + +int main(int argc, char *argv[]); + +/*The following definitions come from rpcclient/spoolss_cmds.c */ + +void add_spl_commands(void); + +/*The following definitions come from rpcclient/svcctrl.c */ + +int main(int argc, char *argv[]); + +/*The following definitions come from rpcclient/svcctrl_cmds.c */ + +char *complete_svcenum(char *text, int state); +void add_svc_commands(void); + /*The following definitions come from rpc_parse/parse_creds.c */ BOOL make_creds_unix(CREDS_UNIX *r_u, const char* user_name, @@ -3223,25 +3568,34 @@ BOOL netsec_decode(struct netsec_auth_struct *a, /*The following definitions come from rpc_parse/parse_ntlmssp.c */ -BOOL rpc_hdr_ntlmssp_auth_chk(RPC_HDR_AUTH *rai); -BOOL make_rpc_auth_ntlmssp_neg(RPC_AUTH_NTLMSSP_NEG *neg, - uint32 neg_flgs, - fstring myname, fstring domain); -BOOL smb_io_rpc_auth_ntlmssp_neg(char *desc, RPC_AUTH_NTLMSSP_NEG *neg, prs_struct *ps, int depth); -BOOL make_rpc_auth_ntlmssp_chal(RPC_AUTH_NTLMSSP_CHAL *chl, - uint32 neg_flags, - uint8 challenge[8]); -BOOL smb_io_rpc_auth_ntlmssp_chal(char *desc, RPC_AUTH_NTLMSSP_CHAL *chl, prs_struct *ps, int depth); -BOOL make_rpc_auth_ntlmssp_resp(RPC_AUTH_NTLMSSP_RESP *rsp, - uchar lm_resp[24], - uchar *nt_resp, size_t nt_len, - char *domain, char *user, char *wks, - uint32 neg_flags); -BOOL smb_io_rpc_auth_ntlmssp_resp(char *desc, RPC_AUTH_NTLMSSP_RESP *rsp, prs_struct *ps, int depth); -BOOL rpc_auth_ntlmssp_chk(RPC_AUTH_NTLMSSP_CHK *chk, uint32 crc32, uint32 seq_num); -BOOL make_rpc_auth_ntlmssp_chk(RPC_AUTH_NTLMSSP_CHK *chk, - uint32 ver, uint32 crc32, uint32 seq_num); -BOOL smb_io_rpc_auth_ntlmssp_chk(char *desc, RPC_AUTH_NTLMSSP_CHK *chk, prs_struct *ps, int depth); +BOOL rpc_hdr_ntlmssp_auth_chk(RPC_HDR_AUTH * rai); +BOOL make_rpc_auth_ntlmssp_neg(RPC_AUTH_NTLMSSP_NEG * neg, + uint32 neg_flgs, + fstring myname, fstring domain); +BOOL smb_io_rpc_auth_ntlmssp_neg(char *desc, RPC_AUTH_NTLMSSP_NEG * neg, + prs_struct *ps, int depth); +BOOL make_rpc_auth_ntlmssp_chal(RPC_AUTH_NTLMSSP_CHAL * chl, + uint32 neg_flags, uint8 challenge[8]); +BOOL smb_io_rpc_auth_ntlmssp_chal(char *desc, RPC_AUTH_NTLMSSP_CHAL * chl, + prs_struct *ps, int depth); +void create_ntlmssp_resp(const uchar lm_owf[24], const uchar nt_owf[128], + size_t nt_owf_len, + const char *domain, const char *user_name, + const char *my_name, uint32 ntlmssp_cli_flgs, + prs_struct *auth_resp); +BOOL make_rpc_auth_ntlmssp_resp(RPC_AUTH_NTLMSSP_RESP * rsp, + const uchar lm_resp[24], + const uchar * nt_resp, size_t nt_len, + const char *domain, const char *user, + const char *wks, uint32 neg_flags); +BOOL smb_io_rpc_auth_ntlmssp_resp(char *desc, RPC_AUTH_NTLMSSP_RESP * rsp, + prs_struct *ps, int depth); +BOOL rpc_auth_ntlmssp_chk(RPC_AUTH_NTLMSSP_CHK * chk, uint32 crc32, + uint32 seq_num); +BOOL make_rpc_auth_ntlmssp_chk(RPC_AUTH_NTLMSSP_CHK * chk, + uint32 ver, uint32 crc32, uint32 seq_num); +BOOL smb_io_rpc_auth_ntlmssp_chk(char *desc, RPC_AUTH_NTLMSSP_CHK * chk, + prs_struct *ps, int depth); /*The following definitions come from rpc_parse/parse_prs.c */ @@ -3471,362 +3825,14 @@ BOOL api_svcctl_rpc(rpcsrv_struct *p); BOOL api_wkssvc_rpc(rpcsrv_struct *p); -/*The following definitions come from rpcclient/cmd_atsvc.c */ - -void cmd_at(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmd_brs.c */ - -void cmd_brs_query_info(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmd_dfs.c */ - -void cmd_dfs_add(struct client_info *info, int argc, char *argv[]); -void cmd_dfs_remove(struct client_info *info, int argc, char *argv[]); -void cmd_dfs_enum(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmd_eventlog.c */ - -void cmd_eventlog(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmd_lsarpc.c */ - -void cmd_lsa_enum_trust_dom(struct client_info *info, int argc, char *argv[]); -void cmd_lsa_query_info(struct client_info *info, int argc, char *argv[]); -void cmd_lsa_lookup_names(struct client_info *info, int argc, char *argv[]); -void cmd_lsa_lookup_sids(struct client_info *info, int argc, char *argv[]); -void cmd_lsa_set_secret(struct client_info *info, int argc, char *argv[]); -void cmd_lsa_create_secret(struct client_info *info, int argc, char *argv[]); -void cmd_lsa_query_secret_secobj(struct client_info *info, int argc, char *argv[]); -void cmd_lsa_query_secret(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmd_netlogon.c */ - -void cmd_netlogon_pwset(struct client_info *info, int argc, char *argv[]); -void cmd_netlogon_login_test(struct client_info *info, int argc, char *argv[]); -void cmd_netlogon_domain_test(struct client_info *info, int argc, - char *argv[]); -void cmd_sam_sync(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmd_reg.c */ - -void split_server_keyname(char *srv_name, char *key, const char* arg); -BOOL msrpc_reg_enum_key(const char* srv_name, const char* full_keyname, - REG_FN(reg_fn), - REG_KEY_FN(reg_key_fn), - REG_VAL_FN(reg_val_fn)); -void cmd_reg_enum(struct client_info *info, int argc, char *argv[]); -void cmd_reg_query_info(struct client_info *info, int argc, char *argv[]); -void cmd_reg_query_key(struct client_info *info, int argc, char *argv[]); -void cmd_reg_create_val(struct client_info *info, int argc, char *argv[]); -void cmd_reg_delete_val(struct client_info *info, int argc, char *argv[]); -void cmd_reg_delete_key(struct client_info *info, int argc, char *argv[]); -void cmd_reg_create_key(struct client_info *info, int argc, char *argv[]); -void cmd_reg_test_key_sec(struct client_info *info, int argc, char *argv[]); -void cmd_reg_get_key_sec(struct client_info *info, int argc, char *argv[]); -void cmd_reg_shutdown(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmd_samr.c */ - -void cmd_sam_ntchange_pwd(struct client_info *info, int argc, char *argv[]); -void cmd_sam_test(struct client_info *info, int argc, char *argv[]); -void cmd_sam_lookup_domain(struct client_info *info, int argc, char *argv[]); -void cmd_sam_lookup_names(struct client_info *info, int argc, char *argv[]); -void cmd_sam_lookup_rids(struct client_info *info, int argc, char *argv[]); -void cmd_sam_del_aliasmem(struct client_info *info, int argc, char *argv[]); -void cmd_sam_delete_dom_alias(struct client_info *info, int argc, - char *argv[]); -void cmd_sam_add_aliasmem(struct client_info *info, int argc, char *argv[]); -void cmd_sam_create_dom_trusting(struct client_info *info, int argc, - char *argv[]); -void cmd_sam_create_dom_user(struct client_info *info, int argc, char *argv[]); -void cmd_sam_create_dom_alias(struct client_info *info, int argc, - char *argv[]); -void cmd_sam_del_groupmem(struct client_info *info, int argc, char *argv[]); -void cmd_sam_delete_dom_user(struct client_info *info, int argc, char *argv[]); -void cmd_sam_delete_dom_group(struct client_info *info, int argc, - char *argv[]); -void cmd_sam_add_groupmem(struct client_info *info, int argc, char *argv[]); -void cmd_sam_create_dom_group(struct client_info *info, int argc, - char *argv[]); -void cmd_sam_enum_users(struct client_info *info, int argc, char *argv[]); -void cmd_sam_query_groupmem(struct client_info *info, int argc, char *argv[]); -void cmd_sam_query_group(struct client_info *info, int argc, char *argv[]); -void cmd_sam_query_sec_obj(struct client_info *info, int argc, char *argv[]); -void cmd_sam_query_user(struct client_info *info, int argc, char *argv[]); -void cmd_sam_set_userinfo2(struct client_info *info, int argc, char *argv[]); -void cmd_sam_set_userinfo(struct client_info *info, int argc, char *argv[]); -void cmd_sam_query_dispinfo(struct client_info *info, int argc, char *argv[]); -void cmd_sam_query_dominfo(struct client_info *info, int argc, char *argv[]); -void cmd_sam_query_aliasmem(struct client_info *info, int argc, char *argv[]); -void cmd_sam_query_alias(struct client_info *info, int argc, char *argv[]); -void cmd_sam_enum_aliases(struct client_info *info, int argc, char *argv[]); -void cmd_sam_enum_groups(struct client_info *info, int argc, char *argv[]); -void cmd_sam_enum_domains(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmd_spoolss.c */ - -BOOL msrpc_spoolss_enum_printers(char* srv_name, uint32 flags, uint32 level, PRINTER_INFO_CTR ctr); -void cmd_spoolss_enum_printers(struct client_info *info, int argc, char *argv[]); -void cmd_spoolss_open_printer_ex(struct client_info *info, int argc, char *argv[]); -BOOL msrpc_spoolss_enum_jobs( const char* printer_name, - const char* station, const char* user_name, - uint32 level, - void ***ctr, JOB_INFO_FN(fn)); -void cmd_spoolss_enum_jobs(struct client_info *info, int argc, char *argv[]); -BOOL msrpc_spoolss_enum_printerdata( const char* printer_name, const char* station, const char* user_name ); -void cmd_spoolss_enum_printerdata(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmd_srvsvc.c */ - -BOOL net_srv_get_info(struct client_info *info, - uint32 info_level, SRV_INFO_CTR * ctr); -void cmd_srv_query_info(struct client_info *info, int argc, char *argv[]); -BOOL msrpc_srv_enum_tprt(const char *dest_srv, - uint32 info_level, - SRV_TPRT_INFO_CTR * ctr, TPRT_INFO_FN(tprt_fn)); -void cmd_srv_enum_tprt(struct client_info *info, int argc, char *argv[]); -void cmd_srv_enum_conn(struct client_info *info, int argc, char *argv[]); -void cmd_srv_enum_shares(struct client_info *info, int argc, char *argv[]); -void cmd_srv_share_get_info(struct client_info *info, int argc, char *argv[]); -void cmd_srv_enum_sess(struct client_info *info, int argc, char *argv[]); -void cmd_srv_enum_files(struct client_info *info, int argc, char *argv[]); -void cmd_time(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmd_svcctl.c */ - -void svc_display_query_svc_cfg(const QUERY_SERVICE_CONFIG *cfg); -BOOL svc_query_service( POLICY_HND *pol_scm, - const char *svc_name, - SVC_QUERY_FN(svc_query_fn)); -void cmd_svc_info(struct client_info *info, int argc, char *argv[]); -BOOL msrpc_svc_enum(const char* srv_name, - ENUM_SRVC_STATUS **svcs, - uint32 *num_svcs, - SVC_INFO_FN(info_fn), - SVC_QUERY_FN(query_fn)); -void cmd_svc_enum(struct client_info *info, int argc, char *argv[]); -void cmd_svc_stop(struct client_info *info, int argc, char *argv[]); -void cmd_svc_start(struct client_info *info, int argc, char *argv[]); -void cmd_svc_set(struct client_info *info, int argc, char *argv[]); -void cmd_svc_unk3(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmd_wkssvc.c */ - -void cmd_wks_query_info(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmdat.c */ - - -/*The following definitions come from rpcclient/cmdat_cmds.c */ - -void add_at_commands(void); - -/*The following definitions come from rpcclient/dfs_cmds.c */ - -char *complete_dfsenum(char *text, int state); -void add_dfs_commands(void); - -/*The following definitions come from rpcclient/display_at.c */ - -void display_at_enum_info(FILE *out_hnd, enum action_type action, - uint32 num_jobs, const AT_ENUM_INFO *const jobs, - char *const *const commands); -void display_at_job_info(FILE *out_hnd, enum action_type action, - AT_JOB_INFO *const job, fstring command); - -/*The following definitions come from rpcclient/display_dfs.c */ - -void display_dfs_enum_1(FILE *hnd, DFS_INFO_CTR *ctr); -void display_dfs_enum_2(FILE *hnd, DFS_INFO_CTR *ctr); -void display_dfs_enum_3_storages(FILE *hnd, DFS_INFO_3 *info3); -void display_dfs_enum_3(FILE *hnd, DFS_INFO_CTR *ctr); -void display_dfs_enum(FILE *hnd, char *srv_name, DFS_INFO_CTR *ctr); - -/*The following definitions come from rpcclient/display_event.c */ - -void display_eventlog_eventrecord(FILE *out_hnd, enum action_type action, EVENTLOGRECORD *const ev); - -/*The following definitions come from rpcclient/display_reg.c */ - -char *get_reg_val_type_str(uint32 type); -void display_reg_value_info(FILE *out_hnd, enum action_type action, - const char *val_name, - uint32 val_type, const BUFFER2 *value); -void display_reg_key_info(FILE *out_hnd, enum action_type action, - const char *key_name, time_t key_mod_time); - -/*The following definitions come from rpcclient/display_sam.c */ - -void display_alias_members(FILE *out_hnd, enum action_type action, - uint32 num_mem, char *const *const sid_mem, - uint32 *const type); -void display_alias_rid_info(FILE *out_hnd, enum action_type action, - DOM_SID *const sid, - uint32 num_rids, uint32 *const rid); -void display_group_members(FILE *out_hnd, enum action_type action, - uint32 num_mem, char *const *const name, uint32 *const type); -void display_group_info_ctr(FILE *out_hnd, enum action_type action, - GROUP_INFO_CTR *const ctr); -void display_group_rid_info(FILE *out_hnd, enum action_type action, - uint32 num_gids, DOM_GID *const gid); -void display_alias_name_info(FILE *out_hnd, enum action_type action, - uint32 num_aliases, fstring *const alias_name, const uint32 *const num_als_usrs); -void display_alias_info_ctr(FILE *out_hnd, enum action_type action, - ALIAS_INFO_CTR *const ctr); -void display_sam_user_info_21(FILE *out_hnd, enum action_type action, SAM_USER_INFO_21 *const usr); -void display_sam_unk_ctr(FILE *out_hnd, enum action_type action, - uint32 switch_value, SAM_UNK_CTR *const ctr); -void display_sam_disp_info_ctr(FILE *out_hnd, enum action_type action, - uint16 level, uint32 count, - SAM_DISPINFO_CTR *const ctr); - -/*The following definitions come from rpcclient/display_sec.c */ - -void display_sec_desc(FILE *out_hnd, enum action_type action, SEC_DESC *const sec); - -/*The following definitions come from rpcclient/display_spool.c */ - -void display_printer_info_ctr(FILE *out_hnd, enum action_type action, uint32 level, - uint32 count, PRINTER_INFO_CTR ctr); -void display_printer_enumdata(FILE *out_hnd, enum action_type action, uint32 idx, - uint32 valuelen, uint16 *value, uint32 rvaluelen, - uint32 type, - uint32 datalen, uint8 *data, uint32 rdatalen); -void display_job_info_2(FILE *out_hnd, enum action_type action, - JOB_INFO_2 *const i2); -void display_job_info_1(FILE *out_hnd, enum action_type action, - JOB_INFO_1 *const i1); -void display_job_info_2_ctr(FILE *out_hnd, enum action_type action, - uint32 count, JOB_INFO_2 *const *const ctr); -void display_job_info_1_ctr(FILE *out_hnd, enum action_type action, - uint32 count, JOB_INFO_1 *const *const ctr); -void display_job_info_ctr(FILE *out_hnd, enum action_type action, - uint32 level, uint32 count, - void *const *const ctr); - -/*The following definitions come from rpcclient/display_srv.c */ - -char *get_file_oplock_str(uint32 op_type); -void display_srv_info_ctr(FILE * out_hnd, enum action_type action, - const SRV_INFO_CTR * ctr); -void display_srv_conn_info_ctr(FILE * out_hnd, enum action_type action, - SRV_CONN_INFO_CTR * const ctr); -void display_tprt_info_0(FILE * out_hnd, enum action_type action, - TPRT_INFO_0 * const info0, - TPRT_INFO_0_STR * const str0); -void display_srv_tprt_info_0_ctr(FILE * out_hnd, enum action_type action, - const SRV_TPRT_INFO_0 * const ctr); -void display_srv_tprt_info_ctr(FILE * out_hnd, enum action_type action, - const SRV_TPRT_INFO_CTR * const ctr); -void display_srv_share_info_ctr(FILE * out_hnd, enum action_type action, - SRV_SHARE_INFO_CTR * const ctr); -void display_share_info_ctr(FILE * out_hnd, enum action_type action, - SHARE_INFO_CTR * const ctr); -void display_srv_file_info_ctr(FILE * out_hnd, enum action_type action, - SRV_FILE_INFO_CTR * const ctr); -void display_srv_sess_info_0_ctr(FILE * out_hnd, enum action_type action, - SRV_SESS_INFO_0 * const ctr); -void display_srv_sess_info_1_ctr(FILE * out_hnd, enum action_type action, - SRV_SESS_INFO_1 * const ctr); -void display_srv_sess_info_ctr(FILE * out_hnd, enum action_type action, - SRV_SESS_INFO_CTR * const ctr); -void display_server(FILE * out_hnd, enum action_type action, - char *const sname, uint32 type, char *const comment); -void display_share(FILE * out_hnd, enum action_type action, - char *const sname, uint32 type, char *const comment); -void display_share2(FILE * out_hnd, enum action_type action, - char *const sname, uint32 type, char *const comment, - uint32 perms, uint32 max_uses, uint32 num_uses, - char *const path, char *const password); -void display_name(FILE * out_hnd, enum action_type action, char *const sname); - -/*The following definitions come from rpcclient/display_svc.c */ - -char *get_svc_start_type_str(uint32 type); -void display_query_svc_cfg(FILE *out_hnd, enum action_type action, - const QUERY_SERVICE_CONFIG *const cfg); -void display_svc_info(FILE *out_hnd, enum action_type action, - const ENUM_SRVC_STATUS *const svc); - -/*The following definitions come from rpcclient/display_sync.c */ - -void display_sam_sync_ctr(FILE *out_hnd, enum action_type action, - SAM_DELTA_HDR *const delta, - SAM_DELTA_CTR *const ctr); -void display_sam_sync(FILE *out_hnd, enum action_type action, - SAM_DELTA_HDR *const deltas, - SAM_DELTA_CTR *const ctr, - uint32 num); - -/*The following definitions come from rpcclient/eventlog.c */ - -int main(int argc, char *argv[]); - -/*The following definitions come from rpcclient/eventlog_cmds.c */ - -void add_evt_commands(void); - -/*The following definitions come from rpcclient/lsa.c */ - - -/*The following definitions come from rpcclient/lsa_cmds.c */ - -void add_lsa_commands(void); - -/*The following definitions come from rpcclient/net.c */ - - -/*The following definitions come from rpcclient/net_cmds.c */ - -void add_net_commands(void); - -/*The following definitions come from rpcclient/netlogon_cmds.c */ - -void add_ntl_commands(void); - -/*The following definitions come from rpcclient/regedit.c */ - - -/*The following definitions come from rpcclient/regedit_cmds.c */ - -void add_reg_commands(void); - -/*The following definitions come from rpcclient/rpcclient.c */ - - -/*The following definitions come from rpcclient/samedit.c */ - - -/*The following definitions come from rpcclient/samedit_cmds.c */ - -void add_sam_commands(void); - -/*The following definitions come from rpcclient/spoolss.c */ - -int main(int argc, char *argv[]); - -/*The following definitions come from rpcclient/spoolss_cmds.c */ - -void add_spl_commands(void); - -/*The following definitions come from rpcclient/svcctrl.c */ - -int main(int argc, char *argv[]); - -/*The following definitions come from rpcclient/svcctrl_cmds.c */ +/*The following definitions come from samrd/samrd.c */ -char *complete_svcenum(char *text, int state); -void add_svc_commands(void); +msrpc_service_fns *get_service_fns(void); /*The following definitions come from samrd/samr_util.c */ uint32 samr_make_usr_obj_sd(SEC_DESC_BUF *buf, DOM_SID *usr_sid); -/*The following definitions come from samrd/samrd.c */ - -msrpc_service_fns *get_service_fns(void); - /*The following definitions come from samrd/srv_samr_als_tdb.c */ uint32 _samr_add_aliasmem(const POLICY_HND *alias_pol, const DOM_SID *sid); @@ -4636,6 +4642,17 @@ BOOL become_user(connection_struct *conn, uint16 vuid); BOOL become_userk(connection_struct *conn, const vuser_key *key); BOOL unbecome_user(void ); +/*The following definitions come from smbd/vfs.c */ + +int vfs_init_default(connection_struct *conn); +BOOL vfs_init_custom(connection_struct *conn); +BOOL vfs_file_exist(connection_struct *conn,char *fname,SMB_STRUCT_STAT *sbuf); +ssize_t vfs_write_data(files_struct *fsp,char *buffer,size_t N); +SMB_OFF_T vfs_transfer_file(int in_fd, files_struct *in_fsp, + int out_fd, files_struct *out_fsp, + SMB_OFF_T n, char *header, int headlen, int align); +char *vfs_readdirname(connection_struct *conn, void *p); + /*The following definitions come from smbd/vfs-wrap.c */ int vfswrap_dummy_connect(struct vfs_connection_struct *conn, char *service, @@ -4665,17 +4682,6 @@ int vfswrap_unlink(char *path); int vfswrap_chmod(char *path, mode_t mode); int vfswrap_utime(char *path, struct utimbuf *times); -/*The following definitions come from smbd/vfs.c */ - -int vfs_init_default(connection_struct *conn); -BOOL vfs_init_custom(connection_struct *conn); -BOOL vfs_file_exist(connection_struct *conn,char *fname,SMB_STRUCT_STAT *sbuf); -ssize_t vfs_write_data(files_struct *fsp,char *buffer,size_t N); -SMB_OFF_T vfs_transfer_file(int in_fd, files_struct *in_fsp, - int out_fd, files_struct *out_fsp, - SMB_OFF_T n, char *header, int headlen, int align); -char *vfs_readdirname(connection_struct *conn, void *p); - /*The following definitions come from smbwrapper/realcalls.c */ int real_utime(const char *name, struct utimbuf *buf); diff --git a/source/libsmb/clientgen.c b/source/libsmb/clientgen.c index 28212a639a6..98d8fa78de5 100644 --- a/source/libsmb/clientgen.c +++ b/source/libsmb/clientgen.c @@ -3147,6 +3147,10 @@ BOOL cli_establish_connection(struct cli_state *cli, char *p; char *e = pwd_buf + sizeof(pwd_buf); + uchar lm_owf[24]; + uchar nt_owf[128]; + size_t nt_owf_len; + /* 1st session setup */ uchar pwd_data[34] = { @@ -3248,7 +3252,9 @@ BOOL cli_establish_connection(struct cli_state *cli, cli->nt.usr_sess_key); } - create_ntlmssp_resp(&cli->usr.pwd, cli->usr.domain, + pwd_get_lm_nt_owf(&cli->usr.pwd, lm_owf, nt_owf, &nt_owf_len); + + create_ntlmssp_resp(lm_owf, nt_owf, nt_owf_len, cli->usr.domain, cli->usr.user_name, cli->calling.name, ntlmssp_flgs, &auth_resp); diff --git a/source/libsmb/smbencrypt.c b/source/libsmb/smbencrypt.c index 72743ce0b9b..1fd10d60e0e 100644 --- a/source/libsmb/smbencrypt.c +++ b/source/libsmb/smbencrypt.c @@ -123,7 +123,7 @@ void lm_owf_gen(const char *pwd, uchar p16[16]) char pwrd[15]; ZERO_STRUCT(pwrd); - + if (pwd != NULL) { safe_strcpy(pwrd, pwd, sizeof(pwrd) - 1); @@ -189,7 +189,7 @@ void SMBOWFencrypt(const uchar pwrd[16], const uchar * c8, uchar p24[24]) /* Does the des encryption from the FIRST 8 BYTES of the NT or LM MD4 hash. */ void NTLMSSPOWFencrypt(const uchar pwrd[8], const uchar * ntlmchalresp, - uchar p24[24]) + uchar p24[24]) { uchar p21[21]; @@ -362,7 +362,7 @@ void ntv2_owf_gen(const uchar owf[16], } /* Does the LM owf of a user's password */ -void lm_owf_genW(const UNISTR2 * pwd, uchar p16[16]) +void lm_owf_genW(const UNISTR2 *pwd, uchar p16[16]) { char pwrd[15]; @@ -390,14 +390,14 @@ void lm_owf_genW(const UNISTR2 * pwd, uchar p16[16]) } /* Does both the NT and LM owfs of a user's password */ -void nt_owf_genW(const UNISTR2 * pwd, uchar nt_p16[16]) +void nt_owf_genW(const UNISTR2 *pwd, uchar nt_p16[16]) { char buf[512]; int i; - - for (i = 0; i < MIN(pwd->uni_str_len, sizeof(buf)/2); i++) + + for (i = 0; i < MIN(pwd->uni_str_len, sizeof(buf) / 2); i++) { - SIVAL(buf, i*2, pwd->buffer[i]); + SIVAL(buf, i * 2, pwd->buffer[i]); } /* Calculate the MD4 hash (NT compatible) of the password */ mdfour(nt_p16, buf, pwd->uni_str_len * 2); @@ -410,7 +410,7 @@ void nt_owf_genW(const UNISTR2 * pwd, uchar nt_p16[16]) } /* Does both the NT and LM owfs of a user's UNICODE password */ -void nt_lm_owf_genW(const UNISTR2 * pwd, uchar nt_p16[16], uchar lm_p16[16]) +void nt_lm_owf_genW(const UNISTR2 *pwd, uchar nt_p16[16], uchar lm_p16[16]) { nt_owf_genW(pwd, nt_p16); lm_owf_genW(pwd, lm_p16); @@ -547,40 +547,11 @@ BOOL nt_decrypt_string2(STRING2 * out, const STRING2 * in, const uchar * key) return True; } -/******************************************************************* - creates a DCE/RPC bind authentication response - - - initialises the parse structure. - - dynamically allocates the header data structure - - caller is expected to free the header data structure once used. - - ********************************************************************/ -void create_ntlmssp_resp(struct pwd_info *pwd, - char *domain, char *user_name, char *my_name, - uint32 ntlmssp_cli_flgs, prs_struct * auth_resp) -{ - RPC_AUTH_NTLMSSP_RESP ntlmssp_resp; - uchar lm_owf[24]; - uchar nt_owf[128]; - size_t nt_owf_len; - - pwd_get_lm_nt_owf(pwd, lm_owf, nt_owf, &nt_owf_len); - - make_rpc_auth_ntlmssp_resp(&ntlmssp_resp, - lm_owf, nt_owf, nt_owf_len, - domain, user_name, my_name, - ntlmssp_cli_flgs); - - smb_io_rpc_auth_ntlmssp_resp("ntlmssp_resp", &ntlmssp_resp, auth_resp, - 0); - prs_realloc_data(auth_resp, auth_resp->offset); -} - /*********************************************************** decode a password buffer ************************************************************/ BOOL decode_pw_buffer(const char buffer[516], char *new_pwrd, - int new_pwrd_size, uint32 * new_pw_len) + int new_pwrd_size, uint32 *new_pw_len) { /* * The length of the new password is in the last 4 bytes of diff --git a/source/rpc_client/cli_pipe_ntlmssp.c b/source/rpc_client/cli_pipe_ntlmssp.c index cf7ea91d2d0..12f988f4f1e 100644 --- a/source/rpc_client/cli_pipe_ntlmssp.c +++ b/source/rpc_client/cli_pipe_ntlmssp.c @@ -432,6 +432,9 @@ static BOOL create_ntlmssp_rpc_bind_resp(struct pwd_info *pwd, RPC_HDR hdr; RPC_HDR_AUTHA hdr_autha; RPC_AUTH_VERIFIER auth_verifier; + uchar lm_owf[24]; + uchar nt_owf[128]; + size_t nt_owf_len; make_rpc_hdr_autha(&hdr_autha, 0x1630, 0x1630, 0x0a, 0x06, 0x00); smb_io_rpc_hdr_autha("hdr_autha", &hdr_autha, rhdr_autha, 0); @@ -443,7 +446,10 @@ static BOOL create_ntlmssp_rpc_bind_resp(struct pwd_info *pwd, smb_io_rpc_auth_verifier("auth_verifier", &auth_verifier, auth_resp, 0); prs_realloc_data(auth_resp, auth_resp->offset); - create_ntlmssp_resp(pwd, domain, user_name, my_name, ntlmssp_cli_flgs, + pwd_get_lm_nt_owf(pwd, lm_owf, nt_owf, &nt_owf_len); + + create_ntlmssp_resp(lm_owf, nt_owf, nt_owf_len, + domain, user_name, my_name, ntlmssp_cli_flgs, auth_resp); /* create the request RPC_HDR */ diff --git a/source/rpc_parse/parse_ntlmssp.c b/source/rpc_parse/parse_ntlmssp.c index bf102f84455..e8064c8247b 100644 --- a/source/rpc_parse/parse_ntlmssp.c +++ b/source/rpc_parse/parse_ntlmssp.c @@ -30,7 +30,7 @@ extern int DEBUGLEVEL; /******************************************************************* checks an RPC_HDR_AUTH structure. ********************************************************************/ -BOOL rpc_hdr_ntlmssp_auth_chk(RPC_HDR_AUTH *rai) +BOOL rpc_hdr_ntlmssp_auth_chk(RPC_HDR_AUTH * rai) { return (rai->auth_type == 0x0a && rai->auth_level == 0x06); } @@ -38,19 +38,21 @@ BOOL rpc_hdr_ntlmssp_auth_chk(RPC_HDR_AUTH *rai) /******************************************************************* creates an RPC_AUTH_NTLMSSP_NEG structure. ********************************************************************/ -BOOL make_rpc_auth_ntlmssp_neg(RPC_AUTH_NTLMSSP_NEG *neg, - uint32 neg_flgs, - fstring myname, fstring domain) +BOOL make_rpc_auth_ntlmssp_neg(RPC_AUTH_NTLMSSP_NEG * neg, + uint32 neg_flgs, + fstring myname, fstring domain) { int len_myname = strlen(myname); int len_domain = strlen(domain); - if (neg == NULL) return False; + if (neg == NULL) + return False; - neg->neg_flgs = neg_flgs ; /* 0x00b2b3 */ + neg->neg_flgs = neg_flgs; /* 0x00b2b3 */ - make_str_hdr(&neg->hdr_domain, len_domain, len_domain, 0x20 + len_myname); - make_str_hdr(&neg->hdr_myname, len_myname, len_myname, 0x20); + make_str_hdr(&neg->hdr_domain, len_domain, len_domain, + 0x20 + len_myname); + make_str_hdr(&neg->hdr_myname, len_myname, len_myname, 0x20); fstrcpy(neg->myname, myname); fstrcpy(neg->domain, domain); @@ -64,10 +66,12 @@ reads or writes an RPC_AUTH_NTLMSSP_NEG structure. *** lkclXXXX HACK ALERT! *** ********************************************************************/ -BOOL smb_io_rpc_auth_ntlmssp_neg(char *desc, RPC_AUTH_NTLMSSP_NEG *neg, prs_struct *ps, int depth) +BOOL smb_io_rpc_auth_ntlmssp_neg(char *desc, RPC_AUTH_NTLMSSP_NEG * neg, + prs_struct *ps, int depth) { int start_offset = ps->offset; - if (neg == NULL) return False; + if (neg == NULL) + return False; prs_debug(ps, depth, desc, "smb_io_rpc_auth_ntlmssp_neg"); depth++; @@ -82,29 +86,37 @@ BOOL smb_io_rpc_auth_ntlmssp_neg(char *desc, RPC_AUTH_NTLMSSP_NEG *neg, prs_stru ZERO_STRUCTP(neg); - smb_io_strhdr("hdr_domain", &(neg->hdr_domain), ps, depth); - smb_io_strhdr("hdr_myname", &(neg->hdr_myname), ps, depth); + smb_io_strhdr("hdr_domain", &(neg->hdr_domain), ps, depth); + smb_io_strhdr("hdr_myname", &(neg->hdr_myname), ps, depth); old_offset = ps->offset; - ps->offset = neg->hdr_myname .buffer + start_offset - 12; - prs_uint8s(True , "myname", ps, depth, (uint8*)neg->myname , MIN(neg->hdr_myname .str_str_len, sizeof(neg->myname ))); - old_offset += neg->hdr_myname .str_str_len; + ps->offset = neg->hdr_myname.buffer + start_offset - 12; + prs_uint8s(True, "myname", ps, depth, (uint8 *)neg->myname, + MIN(neg->hdr_myname.str_str_len, + sizeof(neg->myname))); + old_offset += neg->hdr_myname.str_str_len; - ps->offset = neg->hdr_domain .buffer + start_offset - 12; - prs_uint8s(True , "domain", ps, depth, (uint8*)neg->domain , MIN(neg->hdr_domain .str_str_len, sizeof(neg->domain ))); - old_offset += neg->hdr_domain .str_str_len; + ps->offset = neg->hdr_domain.buffer + start_offset - 12; + prs_uint8s(True, "domain", ps, depth, (uint8 *)neg->domain, + MIN(neg->hdr_domain.str_str_len, + sizeof(neg->domain))); + old_offset += neg->hdr_domain.str_str_len; ps->offset = old_offset; } else { /* writing */ - smb_io_strhdr("hdr_domain", &(neg->hdr_domain), ps, depth); - smb_io_strhdr("hdr_myname", &(neg->hdr_myname), ps, depth); - - prs_uint8s(True , "myname", ps, depth, (uint8*)neg->myname , MIN(neg->hdr_myname .str_str_len, sizeof(neg->myname ))); - prs_uint8s(True , "domain", ps, depth, (uint8*)neg->domain , MIN(neg->hdr_domain .str_str_len, sizeof(neg->domain ))); + smb_io_strhdr("hdr_domain", &(neg->hdr_domain), ps, depth); + smb_io_strhdr("hdr_myname", &(neg->hdr_myname), ps, depth); + + prs_uint8s(True, "myname", ps, depth, (uint8 *)neg->myname, + MIN(neg->hdr_myname.str_str_len, + sizeof(neg->myname))); + prs_uint8s(True, "domain", ps, depth, (uint8 *)neg->domain, + MIN(neg->hdr_domain.str_str_len, + sizeof(neg->domain))); } return True; @@ -113,18 +125,18 @@ BOOL smb_io_rpc_auth_ntlmssp_neg(char *desc, RPC_AUTH_NTLMSSP_NEG *neg, prs_stru /******************************************************************* creates an RPC_AUTH_NTLMSSP_CHAL structure. ********************************************************************/ -BOOL make_rpc_auth_ntlmssp_chal(RPC_AUTH_NTLMSSP_CHAL *chl, - uint32 neg_flags, - uint8 challenge[8]) +BOOL make_rpc_auth_ntlmssp_chal(RPC_AUTH_NTLMSSP_CHAL * chl, + uint32 neg_flags, uint8 challenge[8]) { - if (chl == NULL) return False; + if (chl == NULL) + return False; - chl->unknown_1 = 0x0; + chl->unknown_1 = 0x0; chl->unknown_2 = 0x00000028; - chl->neg_flags = neg_flags; /* 0x0082b1 */ + chl->neg_flags = neg_flags; /* 0x0082b1 */ - memcpy(chl->challenge, challenge, sizeof(chl->challenge)); - bzero (chl->reserved , sizeof(chl->reserved)); + memcpy(chl->challenge, challenge, sizeof(chl->challenge)); + bzero(chl->reserved, sizeof(chl->reserved)); return True; } @@ -132,61 +144,93 @@ BOOL make_rpc_auth_ntlmssp_chal(RPC_AUTH_NTLMSSP_CHAL *chl, /******************************************************************* reads or writes an RPC_AUTH_NTLMSSP_CHAL structure. ********************************************************************/ -BOOL smb_io_rpc_auth_ntlmssp_chal(char *desc, RPC_AUTH_NTLMSSP_CHAL *chl, prs_struct *ps, int depth) +BOOL smb_io_rpc_auth_ntlmssp_chal(char *desc, RPC_AUTH_NTLMSSP_CHAL * chl, + prs_struct *ps, int depth) { - if (chl == NULL) return False; + if (chl == NULL) + return False; prs_debug(ps, depth, desc, "smb_io_rpc_auth_ntlmssp_chal"); depth++; - prs_uint32("unknown_1", ps, depth, &(chl->unknown_1)); /* 0x0000 0000 */ - prs_uint32("unknown_2", ps, depth, &(chl->unknown_2)); /* 0x0000 b2b3 */ - prs_uint32("neg_flags", ps, depth, &(chl->neg_flags)); /* 0x0000 82b1 */ + prs_uint32("unknown_1", ps, depth, &(chl->unknown_1)); /* 0x0000 0000 */ + prs_uint32("unknown_2", ps, depth, &(chl->unknown_2)); /* 0x0000 b2b3 */ + prs_uint32("neg_flags", ps, depth, &(chl->neg_flags)); /* 0x0000 82b1 */ - prs_uint8s (False, "challenge", ps, depth, chl->challenge, sizeof(chl->challenge)); - prs_uint8s (False, "reserved ", ps, depth, chl->reserved , sizeof(chl->reserved )); + prs_uint8s(False, "challenge", ps, depth, chl->challenge, + sizeof(chl->challenge)); + prs_uint8s(False, "reserved ", ps, depth, chl->reserved, + sizeof(chl->reserved)); return True; } /******************************************************************* + creates a DCE/RPC bind authentication response + + - initialises the parse structure. + - dynamically allocates the header data structure + - caller is expected to free the header data structure once used. + + ********************************************************************/ +void create_ntlmssp_resp(const uchar lm_owf[24], const uchar nt_owf[128], + size_t nt_owf_len, + const char *domain, const char *user_name, + const char *my_name, uint32 ntlmssp_cli_flgs, + prs_struct *auth_resp) +{ + RPC_AUTH_NTLMSSP_RESP ntlmssp_resp; + + make_rpc_auth_ntlmssp_resp(&ntlmssp_resp, + lm_owf, nt_owf, nt_owf_len, + domain, user_name, my_name, + ntlmssp_cli_flgs); + + smb_io_rpc_auth_ntlmssp_resp("ntlmssp_resp", &ntlmssp_resp, auth_resp, + 0); + prs_realloc_data(auth_resp, auth_resp->offset); +} + + +/******************************************************************* creates an RPC_AUTH_NTLMSSP_RESP structure. *** lkclXXXX FUDGE! HAVE TO MANUALLY SPECIFY OFFSET HERE (0x1c bytes) *** *** lkclXXXX the actual offset is at the start of the auth verifier *** ********************************************************************/ -BOOL make_rpc_auth_ntlmssp_resp(RPC_AUTH_NTLMSSP_RESP *rsp, - uchar lm_resp[24], - uchar *nt_resp, size_t nt_len, - char *domain, char *user, char *wks, - uint32 neg_flags) +BOOL make_rpc_auth_ntlmssp_resp(RPC_AUTH_NTLMSSP_RESP * rsp, + const uchar lm_resp[24], + const uchar * nt_resp, size_t nt_len, + const char *domain, const char *user, + const char *wks, uint32 neg_flags) { uint32 offset; int dom_len = strlen(domain); - int wks_len = strlen(wks ); - int usr_len = strlen(user ); - int lm_len = nt_len != 0 ? (lm_resp != NULL ? 24 : 0) : 1; + int wks_len = strlen(wks); + int usr_len = strlen(user); + int lm_len = nt_len != 0 ? (lm_resp != NULL ? 24 : 0) : 1; - DEBUG(5,("make_rpc_auth_ntlmssp_resp\n")); + DEBUG(5, ("make_rpc_auth_ntlmssp_resp\n")); - if (rsp == NULL) return False; + if (rsp == NULL) + return False; #ifdef DEBUG_PASSWORD - DEBUG(100,("lm_resp\n")); + DEBUG(100, ("lm_resp\n")); if (lm_resp != NULL) { dump_data(100, lm_resp, lm_len); } - DEBUG(100,("nt_resp\n")); + DEBUG(100, ("nt_resp\n")); if (nt_resp != NULL) { dump_data(100, nt_resp, nt_len); } #endif - DEBUG(6,("dom: %s user: %s wks: %s neg_flgs: 0x%x\n", - domain, user, wks, neg_flags)); + DEBUG(6, ("dom: %s user: %s wks: %s neg_flgs: 0x%x\n", + domain, user, wks, neg_flags)); offset = 0x40; @@ -197,19 +241,19 @@ BOOL make_rpc_auth_ntlmssp_resp(RPC_AUTH_NTLMSSP_RESP *rsp, usr_len *= 2; } - make_str_hdr(&rsp->hdr_domain , dom_len, dom_len, offset); + make_str_hdr(&rsp->hdr_domain, dom_len, dom_len, offset); offset += dom_len; - make_str_hdr(&rsp->hdr_usr , usr_len, usr_len, offset); + make_str_hdr(&rsp->hdr_usr, usr_len, usr_len, offset); offset += usr_len; - make_str_hdr(&rsp->hdr_wks , wks_len, wks_len, offset); + make_str_hdr(&rsp->hdr_wks, wks_len, wks_len, offset); offset += wks_len; - make_str_hdr(&rsp->hdr_lm_resp, lm_len , lm_len , offset); + make_str_hdr(&rsp->hdr_lm_resp, lm_len, lm_len, offset); offset += lm_len; - make_str_hdr(&rsp->hdr_nt_resp, nt_len , nt_len , offset); + make_str_hdr(&rsp->hdr_nt_resp, nt_len, nt_len, offset); offset += nt_len; make_str_hdr(&rsp->hdr_sess_key, 0, 0, offset); @@ -235,15 +279,15 @@ BOOL make_rpc_auth_ntlmssp_resp(RPC_AUTH_NTLMSSP_RESP *rsp, if (IS_BITS_SET_ALL(neg_flags, NTLMSSP_NEGOTIATE_UNICODE)) { - ascii_to_unibuf(rsp->domain, domain, sizeof(rsp->domain)-2); - ascii_to_unibuf(rsp->user , user , sizeof(rsp->user )-2); - ascii_to_unibuf(rsp->wks , wks , sizeof(rsp->wks )-2); + ascii_to_unibuf(rsp->domain, domain, sizeof(rsp->domain) - 2); + ascii_to_unibuf(rsp->user, user, sizeof(rsp->user) - 2); + ascii_to_unibuf(rsp->wks, wks, sizeof(rsp->wks) - 2); } else { fstrcpy(rsp->domain, domain); - fstrcpy(rsp->user , user ); - fstrcpy(rsp->wks , wks ); + fstrcpy(rsp->user, user); + fstrcpy(rsp->wks, wks); } rsp->sess_key[0] = 0; @@ -257,9 +301,11 @@ reads or writes an RPC_AUTH_NTLMSSP_RESP structure. *** lkclXXXX the actual offset is at the start of the auth verifier *** ********************************************************************/ -BOOL smb_io_rpc_auth_ntlmssp_resp(char *desc, RPC_AUTH_NTLMSSP_RESP *rsp, prs_struct *ps, int depth) +BOOL smb_io_rpc_auth_ntlmssp_resp(char *desc, RPC_AUTH_NTLMSSP_RESP * rsp, + prs_struct *ps, int depth) { - if (rsp == NULL) return False; + if (rsp == NULL) + return False; prs_debug(ps, depth, desc, "smb_io_rpc_auth_ntlmssp_resp"); depth++; @@ -272,42 +318,55 @@ BOOL smb_io_rpc_auth_ntlmssp_resp(char *desc, RPC_AUTH_NTLMSSP_RESP *rsp, prs_st ZERO_STRUCTP(rsp); - smb_io_strhdr("hdr_lm_resp ", &rsp->hdr_lm_resp , ps, depth); - smb_io_strhdr("hdr_nt_resp ", &rsp->hdr_nt_resp , ps, depth); - smb_io_strhdr("hdr_domain ", &rsp->hdr_domain , ps, depth); - smb_io_strhdr("hdr_user ", &rsp->hdr_usr , ps, depth); - smb_io_strhdr("hdr_wks ", &rsp->hdr_wks , ps, depth); - smb_io_strhdr("hdr_sess_key", &rsp->hdr_sess_key, ps, depth); + smb_io_strhdr("hdr_lm_resp ", &rsp->hdr_lm_resp, ps, depth); + smb_io_strhdr("hdr_nt_resp ", &rsp->hdr_nt_resp, ps, depth); + smb_io_strhdr("hdr_domain ", &rsp->hdr_domain, ps, depth); + smb_io_strhdr("hdr_user ", &rsp->hdr_usr, ps, depth); + smb_io_strhdr("hdr_wks ", &rsp->hdr_wks, ps, depth); + smb_io_strhdr("hdr_sess_key", &rsp->hdr_sess_key, ps, depth); - prs_uint32("neg_flags", ps, depth, &(rsp->neg_flags)); /* 0x0000 82b1 */ + prs_uint32("neg_flags", ps, depth, &(rsp->neg_flags)); /* 0x0000 82b1 */ old_offset = ps->offset; - ps->offset = rsp->hdr_domain .buffer + 0xc; - prs_uint8s(True , "domain ", ps, depth, (uint8*)rsp->domain , MIN(rsp->hdr_domain .str_str_len, sizeof(rsp->domain ))); - old_offset += rsp->hdr_domain .str_str_len; - - ps->offset = rsp->hdr_usr .buffer + 0xc; - prs_uint8s(True , "user ", ps, depth, (uint8*)rsp->user , MIN(rsp->hdr_usr .str_str_len, sizeof(rsp->user ))); - old_offset += rsp->hdr_usr .str_str_len; - - ps->offset = rsp->hdr_wks .buffer + 0xc; - prs_uint8s(True , "wks ", ps, depth, (uint8*)rsp->wks , MIN(rsp->hdr_wks .str_str_len, sizeof(rsp->wks ))); - old_offset += rsp->hdr_wks .str_str_len; - - ps->offset = rsp->hdr_lm_resp .buffer + 0xc; - prs_uint8s(False, "lm_resp ", ps, depth, (uint8*)rsp->lm_resp , MIN(rsp->hdr_lm_resp .str_str_len, sizeof(rsp->lm_resp ))); - old_offset += rsp->hdr_lm_resp .str_str_len; - - ps->offset = rsp->hdr_nt_resp .buffer + 0xc; - prs_uint8s(False, "nt_resp ", ps, depth, (uint8*)rsp->nt_resp , MIN(rsp->hdr_nt_resp .str_str_len, sizeof(rsp->nt_resp ))); - old_offset += rsp->hdr_nt_resp .str_str_len; + ps->offset = rsp->hdr_domain.buffer + 0xc; + prs_uint8s(True, "domain ", ps, depth, (uint8 *)rsp->domain, + MIN(rsp->hdr_domain.str_str_len, + sizeof(rsp->domain))); + old_offset += rsp->hdr_domain.str_str_len; + + ps->offset = rsp->hdr_usr.buffer + 0xc; + prs_uint8s(True, "user ", ps, depth, (uint8 *)rsp->user, + MIN(rsp->hdr_usr.str_str_len, sizeof(rsp->user))); + old_offset += rsp->hdr_usr.str_str_len; + + ps->offset = rsp->hdr_wks.buffer + 0xc; + prs_uint8s(True, "wks ", ps, depth, (uint8 *)rsp->wks, + MIN(rsp->hdr_wks.str_str_len, sizeof(rsp->wks))); + old_offset += rsp->hdr_wks.str_str_len; + + ps->offset = rsp->hdr_lm_resp.buffer + 0xc; + prs_uint8s(False, "lm_resp ", ps, depth, + (uint8 *)rsp->lm_resp, + MIN(rsp->hdr_lm_resp.str_str_len, + sizeof(rsp->lm_resp))); + old_offset += rsp->hdr_lm_resp.str_str_len; + + ps->offset = rsp->hdr_nt_resp.buffer + 0xc; + prs_uint8s(False, "nt_resp ", ps, depth, + (uint8 *)rsp->nt_resp, + MIN(rsp->hdr_nt_resp.str_str_len, + sizeof(rsp->nt_resp))); + old_offset += rsp->hdr_nt_resp.str_str_len; if (rsp->hdr_sess_key.str_str_len != 0) { ps->offset = rsp->hdr_sess_key.buffer + 0x10; old_offset += rsp->hdr_sess_key.str_str_len; - prs_uint8s(False, "sess_key", ps, depth, (uint8*)rsp->sess_key, MIN(rsp->hdr_sess_key.str_str_len, sizeof(rsp->sess_key))); + prs_uint8s(False, "sess_key", ps, depth, + (uint8 *)rsp->sess_key, + MIN(rsp->hdr_sess_key.str_str_len, + sizeof(rsp->sess_key))); } ps->offset = old_offset; @@ -315,21 +374,34 @@ BOOL smb_io_rpc_auth_ntlmssp_resp(char *desc, RPC_AUTH_NTLMSSP_RESP *rsp, prs_st else { /* writing */ - smb_io_strhdr("hdr_lm_resp ", &rsp->hdr_lm_resp , ps, depth); - smb_io_strhdr("hdr_nt_resp ", &rsp->hdr_nt_resp , ps, depth); - smb_io_strhdr("hdr_domain ", &rsp->hdr_domain , ps, depth); - smb_io_strhdr("hdr_user ", &rsp->hdr_usr , ps, depth); - smb_io_strhdr("hdr_wks ", &rsp->hdr_wks , ps, depth); - smb_io_strhdr("hdr_sess_key", &rsp->hdr_sess_key, ps, depth); - - prs_uint32("neg_flags", ps, depth, &(rsp->neg_flags)); /* 0x0000 82b1 */ - - prs_uint8s(True , "domain ", ps, depth, (uint8*)rsp->domain , MIN(rsp->hdr_domain .str_str_len, sizeof(rsp->domain ))); - prs_uint8s(True , "user ", ps, depth, (uint8*)rsp->user , MIN(rsp->hdr_usr .str_str_len, sizeof(rsp->user ))); - prs_uint8s(True , "wks ", ps, depth, (uint8*)rsp->wks , MIN(rsp->hdr_wks .str_str_len, sizeof(rsp->wks ))); - prs_uint8s(False, "lm_resp ", ps, depth, (uint8*)rsp->lm_resp , MIN(rsp->hdr_lm_resp .str_str_len, sizeof(rsp->lm_resp ))); - prs_uint8s(False, "nt_resp ", ps, depth, (uint8*)rsp->nt_resp , MIN(rsp->hdr_nt_resp .str_str_len, sizeof(rsp->nt_resp ))); - prs_uint8s(False, "sess_key", ps, depth, (uint8*)rsp->sess_key, MIN(rsp->hdr_sess_key.str_str_len, sizeof(rsp->sess_key))); + smb_io_strhdr("hdr_lm_resp ", &rsp->hdr_lm_resp, ps, depth); + smb_io_strhdr("hdr_nt_resp ", &rsp->hdr_nt_resp, ps, depth); + smb_io_strhdr("hdr_domain ", &rsp->hdr_domain, ps, depth); + smb_io_strhdr("hdr_user ", &rsp->hdr_usr, ps, depth); + smb_io_strhdr("hdr_wks ", &rsp->hdr_wks, ps, depth); + smb_io_strhdr("hdr_sess_key", &rsp->hdr_sess_key, ps, depth); + + prs_uint32("neg_flags", ps, depth, &(rsp->neg_flags)); /* 0x0000 82b1 */ + + prs_uint8s(True, "domain ", ps, depth, (uint8 *)rsp->domain, + MIN(rsp->hdr_domain.str_str_len, + sizeof(rsp->domain))); + prs_uint8s(True, "user ", ps, depth, (uint8 *)rsp->user, + MIN(rsp->hdr_usr.str_str_len, sizeof(rsp->user))); + prs_uint8s(True, "wks ", ps, depth, (uint8 *)rsp->wks, + MIN(rsp->hdr_wks.str_str_len, sizeof(rsp->wks))); + prs_uint8s(False, "lm_resp ", ps, depth, + (uint8 *)rsp->lm_resp, + MIN(rsp->hdr_lm_resp.str_str_len, + sizeof(rsp->lm_resp))); + prs_uint8s(False, "nt_resp ", ps, depth, + (uint8 *)rsp->nt_resp, + MIN(rsp->hdr_nt_resp.str_str_len, + sizeof(rsp->nt_resp))); + prs_uint8s(False, "sess_key", ps, depth, + (uint8 *)rsp->sess_key, + MIN(rsp->hdr_sess_key.str_str_len, + sizeof(rsp->sess_key))); } return True; @@ -338,7 +410,8 @@ BOOL smb_io_rpc_auth_ntlmssp_resp(char *desc, RPC_AUTH_NTLMSSP_RESP *rsp, prs_st /******************************************************************* checks an RPC_AUTH_NTLMSSP_CHK structure. ********************************************************************/ -BOOL rpc_auth_ntlmssp_chk(RPC_AUTH_NTLMSSP_CHK *chk, uint32 crc32, uint32 seq_num) +BOOL rpc_auth_ntlmssp_chk(RPC_AUTH_NTLMSSP_CHK * chk, uint32 crc32, + uint32 seq_num) { if (chk == NULL) { @@ -346,13 +419,12 @@ BOOL rpc_auth_ntlmssp_chk(RPC_AUTH_NTLMSSP_CHK *chk, uint32 crc32, uint32 seq_nu } if (chk->crc32 != crc32 || - chk->ver != NTLMSSP_SIGN_VERSION || - chk->seq_num != seq_num) + chk->ver != NTLMSSP_SIGN_VERSION || chk->seq_num != seq_num) { - DEBUG(5,("verify failed - crc %x ver %x seq %d\n", - crc32, NTLMSSP_SIGN_VERSION, seq_num)); - DEBUG(5,("verify expect - crc %x ver %x seq %d\n", - chk->crc32, chk->ver, chk->seq_num)); + DEBUG(5, ("verify failed - crc %x ver %x seq %d\n", + crc32, NTLMSSP_SIGN_VERSION, seq_num)); + DEBUG(5, ("verify expect - crc %x ver %x seq %d\n", + chk->crc32, chk->ver, chk->seq_num)); return False; } return True; @@ -361,15 +433,16 @@ BOOL rpc_auth_ntlmssp_chk(RPC_AUTH_NTLMSSP_CHK *chk, uint32 crc32, uint32 seq_nu /******************************************************************* creates an RPC_AUTH_NTLMSSP_CHK structure. ********************************************************************/ -BOOL make_rpc_auth_ntlmssp_chk(RPC_AUTH_NTLMSSP_CHK *chk, - uint32 ver, uint32 crc32, uint32 seq_num) +BOOL make_rpc_auth_ntlmssp_chk(RPC_AUTH_NTLMSSP_CHK * chk, + uint32 ver, uint32 crc32, uint32 seq_num) { - if (chk == NULL) return False; + if (chk == NULL) + return False; - chk->ver = ver ; + chk->ver = ver; chk->reserved = 0x0; - chk->crc32 = crc32 ; - chk->seq_num = seq_num ; + chk->crc32 = crc32; + chk->seq_num = seq_num; return True; } @@ -377,18 +450,19 @@ BOOL make_rpc_auth_ntlmssp_chk(RPC_AUTH_NTLMSSP_CHK *chk, /******************************************************************* reads or writes an RPC_AUTH_NTLMSSP_CHK structure. ********************************************************************/ -BOOL smb_io_rpc_auth_ntlmssp_chk(char *desc, RPC_AUTH_NTLMSSP_CHK *chk, prs_struct *ps, int depth) +BOOL smb_io_rpc_auth_ntlmssp_chk(char *desc, RPC_AUTH_NTLMSSP_CHK * chk, + prs_struct *ps, int depth) { - if (chk == NULL) return False; + if (chk == NULL) + return False; prs_debug(ps, depth, desc, "smb_io_rpc_auth_ntlmssp_chk"); depth++; - prs_uint32("ver ", ps, depth, &(chk->ver )); - prs_uint32("reserved", ps, depth, &(chk->reserved)); - prs_uint32("crc32 ", ps, depth, &(chk->crc32 )); - prs_uint32("seq_num ", ps, depth, &(chk->seq_num )); + prs_uint32("ver ", ps, depth, &(chk->ver)); + prs_uint32("reserved", ps, depth, &(chk->reserved)); + prs_uint32("crc32 ", ps, depth, &(chk->crc32)); + prs_uint32("seq_num ", ps, depth, &(chk->seq_num)); return True; } - diff --git a/source/rpc_parse/parse_prs.c b/source/rpc_parse/parse_prs.c index 26db987a5da..08f2e9e62f1 100644 --- a/source/rpc_parse/parse_prs.c +++ b/source/rpc_parse/parse_prs.c @@ -566,7 +566,7 @@ void prs_switch_type(prs_struct *ps, BOOL io) } /******************************************************************* - Force a prs_struct to be dynamic even when it's size is 0. + Force a prs_struct to be dynamic even when its size is 0. ********************************************************************/ void prs_force_dynamic(prs_struct *ps) |