summaryrefslogtreecommitdiff
path: root/source3/include/proto.h
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-04-23 20:12:17 +0000
committerJeremy Allison <jra@samba.org>1998-04-23 20:12:17 +0000
commit002a47de8e0cf03c79cedbed2db52f391001f459 (patch)
tree1a23fd1edab2979024d5212f64cdc031d309f481 /source3/include/proto.h
parenta85f5bc268a1c13334b86ac3a44a026359c09371 (diff)
downloadsamba-002a47de8e0cf03c79cedbed2db52f391001f459.tar.gz
samba-002a47de8e0cf03c79cedbed2db52f391001f459.tar.bz2
samba-002a47de8e0cf03c79cedbed2db52f391001f459.zip
clientgen.c: Added rap error codes to cli_error, moved from smbpasswd.c
password.c: Changed global cli -> pw_cli, removed strtok (bad strtok, bad :-) use in security=server, started to extend security=domain code. smbpasswd.c: Removed rap error code functions. Jeremy. (This used to be commit 0f00b8fce1a5cad7f8c212568fa33f09986e5bd6)
Diffstat (limited to 'source3/include/proto.h')
-rw-r--r--source3/include/proto.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 9bba68df48..adf753ccf5 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -51,6 +51,8 @@ void cmd_help(char *dum_in, char *dum_out);
/*The following definitions come from clientgen.c */
+char *cli_smb_errstr(struct cli_state *cli);
+char *cli_errstr(struct cli_state *cli);
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,
@@ -97,7 +99,6 @@ BOOL cli_session_request(struct cli_state *cli, char *host, int name_type,
BOOL cli_connect(struct cli_state *cli, char *host, struct in_addr *ip);
BOOL cli_initialise(struct cli_state *cli);
void cli_shutdown(struct cli_state *cli);
-char *cli_errstr(struct cli_state *cli);
void cli_error(struct cli_state *cli, int *eclass, int *num);
void cli_sockopt(struct cli_state *cli, char *options);
int cli_setpid(struct cli_state *cli, int pid);
@@ -1726,7 +1727,7 @@ struct smb_passwd *getsmbpwuid(unsigned int uid);
char *encode_acct_ctrl(uint16 acct_ctrl);
BOOL add_smbpwd_entry(struct smb_passwd *newpwd);
BOOL mod_smbpwd_entry(struct smb_passwd* pwd);
-void *machine_password_lock( char *doman, char *name, BOOL update);
+void *machine_password_lock( char *domain, char *name, BOOL update);
BOOL machine_password_unlock( void *token );
BOOL get_machine_account_password( void *mach_tok, unsigned char *ret_pwd,
time_t *last_change_time);