diff options
| author | Jeremy Allison <jra@samba.org> | 2004-03-13 02:16:21 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2004-03-13 02:16:21 +0000 |
| commit | 6b9dbbcd249360fb9acd61d6900baccf621c9cce (patch) | |
| tree | 612e870056d4060da62d02ed05f38f1d99cd620d /source3/nmbd/nmbd_namelistdb.c | |
| parent | fd2d4f87d440f24df0adc4cc29f22051536b0dee (diff) | |
| download | samba-6b9dbbcd249360fb9acd61d6900baccf621c9cce.tar.gz samba-6b9dbbcd249360fb9acd61d6900baccf621c9cce.tar.bz2 samba-6b9dbbcd249360fb9acd61d6900baccf621c9cce.zip | |
Modified fix for bugid #784. Based on a patch from moriyama@miraclelinux.com (MORIYAMA Masayuki).
Don't use nstrings to hold workgroup and netbios names. The problem with them is that MB netbios
and workgroup names in unix charset (particularly utf8) may be up to 3x bigger than the name
when represented in dos charset (ie. cp932). So go back to using fstrings for these but
translate into nstrings (ie. 16 byte length values) for transport on the wire.
Jeremy.
(This used to be commit b4ea493599ab414f7828b83f40a5a8b43479ff64)
Diffstat (limited to 'source3/nmbd/nmbd_namelistdb.c')
| -rw-r--r-- | source3/nmbd/nmbd_namelistdb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/nmbd/nmbd_namelistdb.c b/source3/nmbd/nmbd_namelistdb.c index d1c9afd608..9f89abdbb2 100644 --- a/source3/nmbd/nmbd_namelistdb.c +++ b/source3/nmbd/nmbd_namelistdb.c @@ -45,13 +45,13 @@ void set_samba_nb_type(void) static void upcase_name( struct nmb_name *target, struct nmb_name *source ) { int i; - nstring targ; + fstring targ; fstring scope; if( NULL != source ) memcpy( target, source, sizeof( struct nmb_name ) ); - pull_ascii_nstring(targ, target->name); + pull_ascii_nstring(targ, sizeof(targ), target->name); strupper_m( targ ); push_ascii_nstring( target->name, targ); @@ -255,8 +255,8 @@ void standard_success_register(struct subnet_record *subrec, namerec = find_name_on_subnet( subrec, nmbname, FIND_SELF_NAME ); if( NULL == namerec ) { - nstring name; - pull_ascii_nstring(name, nmbname->name); + fstring name; + pull_ascii_nstring(name, sizeof(name), nmbname->name); add_name_to_subnet( subrec, name, nmbname->name_type, nb_flags, ttl, SELF_NAME, 1, ®istered_ip ); } else { |