summaryrefslogtreecommitdiff
path: root/source3/libsmb
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2001-08-24 19:09:37 +0000
committerTim Potter <tpot@samba.org>2001-08-24 19:09:37 +0000
commit31b6b7aecdca9086e4cbbb7ae89fd6d6ca84928d (patch)
tree6d3d9db76f73e714edbc233df27cbb65defc79c4 /source3/libsmb
parentbb94537ab5858fecb34f047c9e5c0e6fe4fd8ae9 (diff)
downloadsamba-31b6b7aecdca9086e4cbbb7ae89fd6d6ca84928d.tar.gz
samba-31b6b7aecdca9086e4cbbb7ae89fd6d6ca84928d.tar.bz2
samba-31b6b7aecdca9086e4cbbb7ae89fd6d6ca84928d.zip
Make domain_client_validate return a status code instead of a boolean.
(This used to be commit b4e79ab34b7df4687966f4ca81b575dce8503775)
Diffstat (limited to 'source3/libsmb')
-rw-r--r--source3/libsmb/domain_client_validate.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/source3/libsmb/domain_client_validate.c b/source3/libsmb/domain_client_validate.c
index de5df84e9b..5c56a815ef 100644
--- a/source3/libsmb/domain_client_validate.c
+++ b/source3/libsmb/domain_client_validate.c
@@ -280,7 +280,7 @@ uint32 domain_client_validate(const auth_usersupplied_info *user_info,
struct cli_state cli;
uint32 smb_uid_low;
BOOL connected_ok = False;
- uint32 nt_status;
+ uint32 status;
/*
* Check that the requested domain is not our own machine name.
@@ -323,12 +323,16 @@ uint32 domain_client_validate(const auth_usersupplied_info *user_info,
ZERO_STRUCT(info3);
- if (!cli_nt_login_network(&cli, user_info, smb_uid_low, &ctr, &info3)) {
- nt_status = cli_nt_error(&cli);
- DEBUG(0,("domain_client_validate: unable to validate password for user %s in domain \
-%s to Domain controller %s. Error was %s.\n", user_info->smb_username.str, user_info->domain.str, remote_machine, cli_errstr(&cli)));
+ if ((status = cli_nt_login_network(&cli, user_info, smb_uid_low,
+ &ctr, &info3))
+ != NT_STATUS_NOPROBLEMO) {
+ DEBUG(0,("domain_client_validate: unable to validate password "
+ "for user %s in domain %s to Domain controller %s. "
+ "Error was %s.\n", user_info->smb_username.str,
+ user_info->domain.str, remote_machine,
+ get_nt_error_msg(status)));
} else {
- nt_status = NT_STATUS_NOPROBLEMO;
+ status = NT_STATUS_NOPROBLEMO;
}
/*
@@ -342,11 +346,11 @@ uint32 domain_client_validate(const auth_usersupplied_info *user_info,
* send here. JRA.
*/
- if (nt_status == NT_STATUS_NOPROBLMO) {
+ if (status == NT_STATUS_NOPROBLMO) {
if(cli_nt_logoff(&cli, &ctr) == False) {
DEBUG(0,("domain_client_validate: unable to log off user %s in domain \
%s to Domain controller %s. Error was %s.\n", user, domain, remote_machine, cli_errstr(&cli)));
- nt_status = NT_STATUS_LOGON_FAILURE;
+ status = NT_STATUS_LOGON_FAILURE;
}
}
#endif /* 0 */
@@ -358,6 +362,6 @@ uint32 domain_client_validate(const auth_usersupplied_info *user_info,
cli_nt_session_close(&cli);
cli_ulogoff(&cli);
cli_shutdown(&cli);
- return nt_status;
+ return status;
}