diff options
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/client.h | 20 | ||||
-rw-r--r-- | source3/include/proto.h | 3 |
2 files changed, 17 insertions, 6 deletions
diff --git a/source3/include/client.h b/source3/include/client.h index 7c5854b556..78c7d977c0 100644 --- a/source3/include/client.h +++ b/source3/include/client.h @@ -78,7 +78,17 @@ struct pwd_info uchar sess_key[16]; }; -struct cli_state { +struct user_credentials +{ + fstring user_name; + fstring domain; + struct pwd_info pwd; + + uint32 ntlmssp_flags; +}; + +struct cli_state +{ int port; int fd; uint16 cnum; @@ -88,12 +98,12 @@ struct cli_state { int protocol; int sec_mode; int rap_error; - int privilages; + int privileges; + + struct user_credentials usr; fstring eff_name; fstring desthost; - fstring user_name; - fstring domain; /* * The following strings are the @@ -108,10 +118,8 @@ struct cli_state { fstring dev; struct nmb_name called; struct nmb_name calling; - fstring full_dest_host_name; struct in_addr dest_ip; - struct pwd_info pwd; unsigned char cryptkey[8]; unsigned char lm_cli_chal[8]; unsigned char nt_cli_chal[128]; diff --git a/source3/include/proto.h b/source3/include/proto.h index 580ab22f96..475c1a2bac 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -481,6 +481,7 @@ int set_maxfiles(int requested_max); void reg_get_subkey(char *full_keyname, char *key_name, char *subkey_name); BOOL reg_split_key(const char *full_keyname, uint32 *reg_type, char *key_name); BOOL become_user_permanently(uid_t uid, gid_t gid); +BOOL resolve_srv_name(const char* srv_name, fstring dest_host, struct in_addr *ip); /*The following definitions come from lib/util_array.c */ @@ -668,6 +669,7 @@ void unistr2_free(UNISTR2 *name); /*The following definitions come from libsmb/clientgen.c */ +void copy_user_creds(struct user_credentials *to, const struct user_credentials *from); 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); @@ -747,6 +749,7 @@ 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 user_credentials *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); |