[patch] for charconv in samba.HEAD
Ihar Viarheichyk
i.viarheichyk at sam-solutions.net
Wed Dec 19 01:23:18 GMT 2001
I noticed that in 'Session setup andX response' packet w2k (win2k server)
returns only 'OS' and 'Lan Manager' fields, but not 'Domain'. So in
cli_session_setup_blob no domain detected, and smbclient prints empty
string for domain. Is is also true for w2k professional?
Further, UCS-2LE string for 'Lan manager' ends with
one-byte zero-terminator. Here is small patch which allows handle it
without printing 'Illegal multibyte sequence' to log.
--
Igor Vergeichik
ICQ 47298730
-------------- next part --------------
diff -ruNk.orig samba.HEAD/source/lib/charcnv.c.orig samba.HEAD/source/lib/charcnv.c
--- samba.HEAD/source/lib/charcnv.c.orig Tue Dec 18 16:47:33 2001
+++ samba.HEAD/source/lib/charcnv.c Tue Dec 18 16:49:14 2001
@@ -134,7 +134,7 @@
break;
- case EILSEQ: reason="Illegal myltibyte sequence"; break;
+ case EILSEQ: reason="Illegal multibyte sequence"; break;
}
DEBUG(0,("Conversion error: %s(%s)\n",reason,inbuf));
/* smb_panic(reason); */
@@ -402,7 +402,7 @@
if (src_len > 0) src_len--;
}
- if (flags & STR_TERMINATE) src_len = strlen_w(src)*2+2;
+ if (flags & STR_TERMINATE) src_len = strlen_w(src)*2+1;
/* ucs2 is always a multiple of 2 bytes */
src_len &= ~1;
More information about the samba-technical
mailing list