sync 3.0 into HEAD for the last time

[vlendec/samba-autobuild/.git] / source3 / smbd / message.c

diff --git a/source3/smbd/message.c b/source3/smbd/message.c
index 233848d2d610d0ad3b181d2e2c9da0210047158d..88f833e468617c2d40bffc0a497ff85edc79585a 100644 (file)
--- a/source3/smbd/message.c
+++ b/source3/smbd/message.c
@@ -64,7 +64,7 @@ static void msg_deliver(void)
    * Incoming message is in DOS codepage format. Convert to UNIX.
    */
   
-  if ((len = convert_string_allocate(CH_DOS, CH_UNIX, msgbuf, msgpos, (void **) &msg)) < 0 || !msg) {
+  if ((len = convert_string_allocate(NULL,CH_DOS, CH_UNIX, msgbuf, msgpos, (void **) &msg)) < 0 || !msg) {
     DEBUG(3,("Conversion failed, delivering message in DOS codepage format\n"));
     for (i = 0; i < msgpos;) {
       if (msgbuf[i] == '\r' && i < (msgpos-1) && msgbuf[i+1] == '\n') {