diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2001-11-11 11:18:45 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2001-11-11 11:18:45 +0000 |
| commit | 5edc5977866a5bfdf8e689e90b73483a7b1e3246 (patch) | |
| tree | bf16e3663cff8a1517040ae9dc152dbffc2b5db6 | |
| parent | 63a8a2ebe880b4cf893ac3e97a5de52b74a39e1c (diff) | |
| download | samba-5edc5977866a5bfdf8e689e90b73483a7b1e3246.tar.gz samba-5edc5977866a5bfdf8e689e90b73483a7b1e3246.tar.bz2 samba-5edc5977866a5bfdf8e689e90b73483a7b1e3246.zip | |
Add back the not null checks in a better place.
Check the pdb_init_sam() for failure.
(This used to be commit 1808cd5210258bddc349f13a7bcf20a3f46aa672)
| -rw-r--r-- | source3/auth/auth_sam.c | 8 | ||||
| -rw-r--r-- | source3/smbd/auth_smbpasswd.c | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c index 717e30eda7..70632fb5df 100644 --- a/source3/auth/auth_sam.c +++ b/source3/auth/auth_sam.c @@ -344,7 +344,13 @@ NTSTATUS check_smbpasswd_security(const auth_usersupplied_info *user_info, auth_ uint8 user_sess_key[16]; const uint8* lm_hash; - pdb_init_sam(&sampass); + if (!user_info) { + return NT_STATUS_LOGON_FAILURE; + } + + if (!pdb_init_sam(&sampass)) { + return NT_STATUS_NO_MEMORY; + } /* get the account information */ diff --git a/source3/smbd/auth_smbpasswd.c b/source3/smbd/auth_smbpasswd.c index 717e30eda7..70632fb5df 100644 --- a/source3/smbd/auth_smbpasswd.c +++ b/source3/smbd/auth_smbpasswd.c @@ -344,7 +344,13 @@ NTSTATUS check_smbpasswd_security(const auth_usersupplied_info *user_info, auth_ uint8 user_sess_key[16]; const uint8* lm_hash; - pdb_init_sam(&sampass); + if (!user_info) { + return NT_STATUS_LOGON_FAILURE; + } + + if (!pdb_init_sam(&sampass)) { + return NT_STATUS_NO_MEMORY; + } /* get the account information */ |