sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

Style cleanup for the last vuid change.

Browse Source 
Style, doco and DEBUG() fixes for auth_smbpasswd.c
(In particular for the account control call).

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 0001-01-01 00:00:00 +00:00
parent 204da7ba96
commit 3d91c11942
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/auth/auth_sam.c
View File

@ -112,14 +112,17 @@ static BOOL smb_pwd_check_ntlmv2(const uchar *password, size_t pwd_len,
uint32 smb_password_ok(SAM_ACCOUNT *sampass, const auth_usersupplied_info *user_info, auth_serversupplied_info *server_info) uint32 smb_password_ok(SAM_ACCOUNT *sampass, const auth_usersupplied_info *user_info, auth_serversupplied_info *server_info)
{ {
uint8 *nt_pw, *lm_pw; uint8 *nt_pw, *lm_pw;
uint16 acct_ctrl;
acct_ctrl = pdb_get_acct_ctrl(sampass);
/* Quit if the account was disabled. */ /* Quit if the account was disabled. */
if(pdb_get_acct_ctrl(sampass) & ACB_DISABLED) { if(acct_ctrl & ACB_DISABLED) {
DEBUG(1,("Account for user '%s' was disabled.\n", user_info->smb_username.str)); DEBUG(1,("Account for user '%s' was disabled.\n", user_info->smb_username.str));
return(NT_STATUS_ACCOUNT_DISABLED); return(NT_STATUS_ACCOUNT_DISABLED);
} }
if (pdb_get_acct_ctrl(sampass) & ACB_PWNOTREQ) if (acct_ctrl & ACB_PWNOTREQ)
{ {
if (lp_null_passwords()) if (lp_null_passwords())
{ {
@ -155,7 +158,7 @@ uint32 smb_password_ok(SAM_ACCOUNT *sampass, const auth_usersupplied_info *user_
{ {
return NT_STATUS_NOPROBLEMO; return NT_STATUS_NOPROBLEMO;
} }
DEBUG(4,("smb_password_ok: NT MD4 password check failed\n")); DEBUG(4,("smb_password_ok: NTLMv2 password check failed\n"));
} else if (lp_ntlm_auth() && (user_info->nt_resp.len == 24 )) { } else if (lp_ntlm_auth() && (user_info->nt_resp.len == 24 )) {
/* We have the NT MD4 hash challenge available - see if we can /* We have the NT MD4 hash challenge available - see if we can
@ -195,8 +198,8 @@ uint32 smb_password_ok(SAM_ACCOUNT *sampass, const auth_usersupplied_info *user_
/**************************************************************************** /****************************************************************************
check if a username/password is OK assuming the password is a 24 byte check if a username/password is OK assuming the password is a 24 byte
SMB hash SMB hash supplied in the user_info structure
return True if the password is correct, False otherwise return an NT_STATUS constant.
****************************************************************************/ ****************************************************************************/
uint32 check_smbpasswd_security(const auth_usersupplied_info *user_info, auth_serversupplied_info *server_info) uint32 check_smbpasswd_security(const auth_usersupplied_info *user_info, auth_serversupplied_info *server_info)

13
source/smbd/auth_smbpasswd.c
View File

@ -112,14 +112,17 @@ static BOOL smb_pwd_check_ntlmv2(const uchar *password, size_t pwd_len,
uint32 smb_password_ok(SAM_ACCOUNT *sampass, const auth_usersupplied_info *user_info, auth_serversupplied_info *server_info) uint32 smb_password_ok(SAM_ACCOUNT *sampass, const auth_usersupplied_info *user_info, auth_serversupplied_info *server_info)
{ {
uint8 *nt_pw, *lm_pw; uint8 *nt_pw, *lm_pw;
uint16 acct_ctrl;
acct_ctrl = pdb_get_acct_ctrl(sampass);
/* Quit if the account was disabled. */ /* Quit if the account was disabled. */
if(pdb_get_acct_ctrl(sampass) & ACB_DISABLED) { if(acct_ctrl & ACB_DISABLED) {
DEBUG(1,("Account for user '%s' was disabled.\n", user_info->smb_username.str)); DEBUG(1,("Account for user '%s' was disabled.\n", user_info->smb_username.str));
return(NT_STATUS_ACCOUNT_DISABLED); return(NT_STATUS_ACCOUNT_DISABLED);
} }
if (pdb_get_acct_ctrl(sampass) & ACB_PWNOTREQ) if (acct_ctrl & ACB_PWNOTREQ)
{ {
if (lp_null_passwords()) if (lp_null_passwords())
{ {
@ -155,7 +158,7 @@ uint32 smb_password_ok(SAM_ACCOUNT *sampass, const auth_usersupplied_info *user_
{ {
return NT_STATUS_NOPROBLEMO; return NT_STATUS_NOPROBLEMO;
} }
DEBUG(4,("smb_password_ok: NT MD4 password check failed\n")); DEBUG(4,("smb_password_ok: NTLMv2 password check failed\n"));
} else if (lp_ntlm_auth() && (user_info->nt_resp.len == 24 )) { } else if (lp_ntlm_auth() && (user_info->nt_resp.len == 24 )) {
/* We have the NT MD4 hash challenge available - see if we can /* We have the NT MD4 hash challenge available - see if we can
@ -195,8 +198,8 @@ uint32 smb_password_ok(SAM_ACCOUNT *sampass, const auth_usersupplied_info *user_
/**************************************************************************** /****************************************************************************
check if a username/password is OK assuming the password is a 24 byte check if a username/password is OK assuming the password is a 24 byte
SMB hash SMB hash supplied in the user_info structure
return True if the password is correct, False otherwise return an NT_STATUS constant.
****************************************************************************/ ****************************************************************************/
uint32 check_smbpasswd_security(const auth_usersupplied_info *user_info, auth_serversupplied_info *server_info) uint32 check_smbpasswd_security(const auth_usersupplied_info *user_info, auth_serversupplied_info *server_info)

2
source/smbd/password.c
View File

@ -203,7 +203,7 @@ tell random client vuid's (normally zero) from valid vuids.
****************************************************************************/ ****************************************************************************/
int register_vuid(uid_t uid,gid_t gid, char *unix_name, char *requested_name, int register_vuid(uid_t uid,gid_t gid, char *unix_name, char *requested_name,
char *domain,BOOL guest, char* full_name) char *domain,BOOL guest, char *full_name)
{ {
user_struct *vuser = NULL; user_struct *vuser = NULL;