Samba 3.0.0 rc 3

[Jeremy Allison]

On Tue, Sep 09, 2003 at 10:31:35PM +0200, Radio Gong 2000 GmbH & Co. KG [Technik] wrote:
> Hi there,
> 
> today I installed samba 3.0.0 rc 3 on redhat 9.
> 
> Now I got following problem:
> 
> "Illegal multibyte sequence" -> and all processors have a cpu-state of 99,9%
> while reading files...
> 
> It seems to me that the iconv string does not work properly with my charset
> for german.
> 
> Here're the entries from my smb.conf:
> 
>         unix charset = ISO-8859-15
>         display charset = ISO-8859-15
>         dos charset = 850
> 
> What did I miss???
> 
> Greetz and thank you for helping
> 
> Sascha
> 
> P.S.: I switched back to samba 3.0.0 rc2 and everything works fine again.

Please try the following patch and see if this fixes the problem. It
just missed the RC3 cutoff but is in current CVS.

Jeremy.

--- lib/charcnv.c       Mon Sep  8 07:13:30 2003
+++ /home/jeremy/src/samba3.0/source/lib/charcnv.c      Mon Sep  8 14:27:10 2003
@@ -270,7 +270,7 @@
                                        break;
                        } else {
                                if (srclen == (size_t)-1) {
-                                       srclen = strlen(src)+1;
+                                       srclen = strlen(p)+1;
                                }
                                return retval + convert_string_internal(from, to, p, srclen, q, destlen);
                        }
@@ -296,7 +296,7 @@
                                        break;
                        } else {
                                if (srclen == (size_t)-1) {
-                                       srclen = strlen_w(src)+2;
+                                       srclen = strlen_w((const void *)p)+2;
                                }
                                return retval + convert_string_internal(from, to, p, srclen, q, destlen);
                        }
@@ -322,7 +322,7 @@
                                        break;
                        } else {
                                if (srclen == (size_t)-1) {
-                                       srclen = strlen(src)+1;
+                                       srclen = strlen(p)+1;
                                }
                                return retval + convert_string_internal(from, to, p, srclen, q, destlen);
                        }