summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-06-10 22:03:33 +0000
committerGerald Carter <jerry@samba.org>2005-06-10 22:03:33 +0000
commit6a2f63c3b142ad03433b8b166c14c03d172b2a3c (patch)
tree84a21c57d053529c0d843ca492550205c60b6099
parentc2f746ac214c9278d969a044ba5ebb61b5f6b82d (diff)
downloadsamba-6a2f63c3b142ad03433b8b166c14c03d172b2a3c.tar.gz
samba-6a2f63c3b142ad03433b8b166c14c03d172b2a3c.tar.xz
samba-6a2f63c3b142ad03433b8b166c14c03d172b2a3c.zip
r7472: fix smbpasswd user password change (still worked by bad error messages) due to trying to strdup a NULL pointer
-rw-r--r--source/libsmb/ntlmssp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/libsmb/ntlmssp.c b/source/libsmb/ntlmssp.c
index 4d9aaf989b1..574b37d4a04 100644
--- a/source/libsmb/ntlmssp.c
+++ b/source/libsmb/ntlmssp.c
@@ -138,7 +138,7 @@ static NTSTATUS set_challenge(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *ch
NTSTATUS ntlmssp_set_username(NTLMSSP_STATE *ntlmssp_state, const char *user)
{
- ntlmssp_state->user = talloc_strdup(ntlmssp_state->mem_ctx, user);
+ ntlmssp_state->user = talloc_strdup(ntlmssp_state->mem_ctx, user ? user : "" );
if (!ntlmssp_state->user) {
return NT_STATUS_NO_MEMORY;
}
@@ -168,7 +168,7 @@ NTSTATUS ntlmssp_set_password(NTLMSSP_STATE *ntlmssp_state, const char *password
*/
NTSTATUS ntlmssp_set_domain(NTLMSSP_STATE *ntlmssp_state, const char *domain)
{
- ntlmssp_state->domain = talloc_strdup(ntlmssp_state->mem_ctx, domain);
+ ntlmssp_state->domain = talloc_strdup(ntlmssp_state->mem_ctx, domain ? domain : "" );
if (!ntlmssp_state->domain) {
return NT_STATUS_NO_MEMORY;
}