go back to ascii in SMB_FIND_FILE_BOTH_DIRECTORY_INFO
authorAndrew Tridgell <tridge@samba.org>
Sun, 30 Apr 2000 14:30:47 +0000 (14:30 +0000)
committerAndrew Tridgell <tridge@samba.org>
Sun, 30 Apr 2000 14:30:47 +0000 (14:30 +0000)
NT gives out unicode, but NT clients can't handle a unicode response!
(This used to be commit 85d634974f4f8841bf68cd2b22d134fbc010b568)

source3/smbd/trans2.c

index 7ae24f9e3899043d13a5d48e8c50999b7583fd6b..458d6f3ec01837c4162dc781ca7e96c237324335 100644 (file)
@@ -522,16 +522,10 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
       SIVAL(p,0,strlen(fname)); p += 4;
       SIVAL(p,0,0); p += 4;
       if (!was_8_3) {
-             /* NT4 always uses unicode here */
-             fstring short_name, ushort_name;
-             int slen;
-             pstrcpy(short_name,fname);
-             name_map_mangle(short_name,True,True,SNUM(conn));
-             strupper(short_name);
-             slen = strlen(short_name);
-             ascii_to_unistr(ushort_name, short_name, 24);
-             memcpy(p+2, ushort_name, 2*slen);
-             SSVAL(p, 0, 2*slen);
+             fstrcpy(p+2,fname);
+             name_map_mangle(p+2,True,True,SNUM(conn));
+             strupper(p+2);
+             SSVAL(p, 0, strlen(p+2));
       } else {
              SSVAL(p,0,0);
              *(p+2) = 0;