sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00
Code

Now that we always get back an NTSTATUS code actually pass it on to the

Browse Source 
auth subsytem.  Also kill off the (unneeded) wrapper fuction.

Andrew Bartlett
(This used to be commit 96f06b490ac5e9fd86debccf8d41675fa41f7726)
This commit is contained in:
Andrew Bartlett 2001-09-14 10:38:40 +00:00
parent cbd99a13c5
commit b7a0c13289
4 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source3/auth/auth_server.c
View File

@ -110,10 +110,11 @@ struct cli_state *server_cryptkey(void)
/****************************************************************************
Validate a password with the password server.
Check for a valid username and password in security=server mode.
- Validate a password with the password server.
****************************************************************************/
static NTSTATUS server_validate(const auth_usersupplied_info *user_info, auth_serversupplied_info *server_info)
NTSTATUS check_server_security(const auth_usersupplied_info *user_info, auth_serversupplied_info *server_info)
{
struct cli_state *cli;
static unsigned char badpass[24];
@ -212,7 +213,7 @@ use this machine as the password server.\n"));
user_info->domain.str)) {
DEBUG(1,("password server %s rejected the password\n", cli->desthost));
/* Make this cli_nt_error() when the conversion is in */
nt_status = NT_STATUS_LOGON_FAILURE;
nt_status = cli_nt_error(cli);
} else {
nt_status = NT_STATUS_OK;
}
@ -228,17 +229,4 @@ use this machine as the password server.\n"));
return(nt_status);
}
/****************************************************************************
Check for a valid username and password in security=server mode.
****************************************************************************/
NTSTATUS check_server_security(const auth_usersupplied_info *user_info, auth_serversupplied_info *server_info)
{
if(lp_security() != SEC_SERVER)
return NT_STATUS_LOGON_FAILURE;
return server_validate(user_info, server_info);
}

2
source3/auth/auth_util.c
View File

@ -98,7 +98,7 @@ static int smb_delete_user(char *unix_user)
}
/****************************************************************************
Add and Delete UNIX users on demand, based on NT_STATUS codes.
Add and Delete UNIX users on demand, based on NTSTATUS codes.
****************************************************************************/
void smb_user_control(char *unix_user, NTSTATUS nt_status)

20
source3/smbd/auth_server.c
View File

@ -110,10 +110,11 @@ struct cli_state *server_cryptkey(void)
/****************************************************************************
Validate a password with the password server.
Check for a valid username and password in security=server mode.
- Validate a password with the password server.
****************************************************************************/
static NTSTATUS server_validate(const auth_usersupplied_info *user_info, auth_serversupplied_info *server_info)
NTSTATUS check_server_security(const auth_usersupplied_info *user_info, auth_serversupplied_info *server_info)
{
struct cli_state *cli;
static unsigned char badpass[24];
@ -212,7 +213,7 @@ use this machine as the password server.\n"));
user_info->domain.str)) {
DEBUG(1,("password server %s rejected the password\n", cli->desthost));
/* Make this cli_nt_error() when the conversion is in */
nt_status = NT_STATUS_LOGON_FAILURE;
nt_status = cli_nt_error(cli);
} else {
nt_status = NT_STATUS_OK;
}
@ -228,17 +229,4 @@ use this machine as the password server.\n"));
return(nt_status);
}
/****************************************************************************
Check for a valid username and password in security=server mode.
****************************************************************************/
NTSTATUS check_server_security(const auth_usersupplied_info *user_info, auth_serversupplied_info *server_info)
{
if(lp_security() != SEC_SERVER)
return NT_STATUS_LOGON_FAILURE;
return server_validate(user_info, server_info);
}

2
source3/smbd/auth_util.c
View File

@ -98,7 +98,7 @@ static int smb_delete_user(char *unix_user)
}
/****************************************************************************
Add and Delete UNIX users on demand, based on NT_STATUS codes.
Add and Delete UNIX users on demand, based on NTSTATUS codes.
****************************************************************************/
void smb_user_control(char *unix_user, NTSTATUS nt_status)