merge from 2.2. Why is STR_CONVERT missing when comparing

2.2 to HEAD?
(This used to be commit 4f47daf97b9e74ec75287f46e2c4aeddc944779e)

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index aae21cb6d9e3b5335d57b88ce03516ce1957747f..2a84b69faa605816d71c0e45a124ae34cc9d091d 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -89,7 +89,7 @@ static BOOL cli_session_setup_lanman2(struct cli_state *cli, char *user,
        p = smb_buf(cli->outbuf);
        memcpy(p,pword,passlen);
        p += passlen;
-       p += clistr_push(cli, p, user, -1, STR_UPPER|STR_TERMINATE);
+       p += clistr_push(cli, p, user, -1, STR_TERMINATE);
        cli_setup_bcc(cli, p);
 
        cli_send_smb(cli);