[Samba] Invalid workgroup name in browse list

[Jeremy Allison]

On Fri, Jun 11, 2004 at 12:24:32PM -0400, mike at jurney.org wrote:
> 
> On Fri, 11 Jun 2004, Jeremy Allison wrote:
> 
> > On Fri, Jun 11, 2004 at 11:01:18AM -0400, mike at jurney.org wrote:
> > >
> > > On my PDC, which is also the DMB, there is a duplicate entry for a trusted
> > > domain that is run on an AD controller on the same ethernet segment.  The
> > > duplicate, though, has several spaces after the name (from browse.dat):
> > >
> > > "BROADWAY"                80001000 "CALIMERO"                    "BROADWAY"
> > > "BROADWAY       "         80001000 "CALIMERO"                    "BROADWAY       "
> > >
> > > When I set enhanced browsing to no on the DMB and restart, the duplicate
> > > goes away.  When I set it back to yes and restart, it shows up
> > > immediately.  What could be causing this?
> >
> > It's a bug we've fixed in current svn. Jerry has the patch for it if
> > you  need a fix immediately. It'll be fixed in 3.0.5.
> 
> Yes, please.  Where can I grab it?

Here it is, sorry for the delay.

Jeremy.

--- lib/charcnv.c       2004-05-28 16:10:52.000000000 -0700
+++ /home/jeremy/src/samba3.0/source/lib/charcnv.c      2004-05-27 15:04:24.000000000 -0700
@@ -932,7 +932,7 @@
                                                                                                                   
 size_t pull_ascii_nstring(char *dest, size_t dest_len, const void *src)
 {
-       return pull_ascii(dest, src, dest_len, sizeof(nstring), STR_TERMINATE);
+       return pull_ascii(dest, src, dest_len, sizeof(nstring)-1, STR_TERMINATE);
 }