r4357: Return a more sensible error code if a NULL (as opposed to the valid

"") username is asked for.

Andrew Bartlett
(This used to be commit 9c9055603e1171e204f67b019900339f88414841)

diff --git a/source4/libcli/auth/ntlmssp.c b/source4/libcli/auth/ntlmssp.c
index bee93985acd7698c14a701bfa1679acddddf99a4..6ece0f6df611c3479dba2fd8b410b665294a0450 100644 (file)
--- a/source4/libcli/auth/ntlmssp.c
+++ b/source4/libcli/auth/ntlmssp.c
@@ -145,10 +145,11 @@ static NTSTATUS set_challenge(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *ch
 
 NTSTATUS ntlmssp_set_username(struct ntlmssp_state *ntlmssp_state, const char *user) 
 {
 
 NTSTATUS ntlmssp_set_username(struct ntlmssp_state *ntlmssp_state, const char *user) 
 {

-       ntlmssp_state->user = talloc_strdup(ntlmssp_state, user);

        if (!user) {
        if (!user) {

-               ntlmssp_state->user = NULL;
+               /* it should be at least "" */
+               return NT_STATUS_INVALID_PARAMETER;

        }
        }

+       ntlmssp_state->user = talloc_strdup(ntlmssp_state, user);

        if (!ntlmssp_state->user) {
                return NT_STATUS_NO_MEMORY;
        }
        if (!ntlmssp_state->user) {
                return NT_STATUS_NO_MEMORY;
        }