merge alt_name patch from head

(This used to be commit 20ebdee36d5351731698bdef6602fc73a45b1651)

diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index 792a3e7aa0e3eb20a3f90bc89277f5a0aa92fad3..f8f840abaa5256293d8491eddaac4c80fde3ac89 100644 (file)
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -727,7 +727,7 @@ NTSTATUS cli_qpathinfo_alt_name(struct cli_state *cli, const char *fname, fstrin
                return NT_STATUS_INVALID_NETWORK_RESPONSE;
        }
 
-       clistr_pull(cli, alt_name, rdata+4, sizeof(fstring), len, 0);
+       clistr_pull(cli, alt_name, rdata+4, sizeof(fstring), len, STR_UNICODE);
 
        SAFE_FREE(rdata);
        SAFE_FREE(rparam);

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 872e33c832571213617d4eb892e006acd292d0f0..b9956370c2fb8ccebc75e84f28e58e0e4066211d 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -1794,7 +1794,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn,
                        if(!mangle_is_8_3(short_name, True)) {
                                mangle_map(short_name,True,True,SNUM(conn));
                        }
-                       len = srvstr_push(outbuf, pdata+4, short_name, -1, STR_TERMINATE|STR_UPPER);
+                       len = srvstr_push(outbuf, pdata+4, short_name, -1, STR_UNICODE);
                        data_size = 4 + len;
                        SIVAL(pdata,0,len);
                        break;