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/include | |
| 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/include')
| -rw-r--r-- | source3/include/nameserv.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/include/nameserv.h b/source3/include/nameserv.h index 1e867d620b..5362960d62 100644 --- a/source3/include/nameserv.h +++ b/source3/include/nameserv.h @@ -226,8 +226,8 @@ struct name_record { /* Browser cache for synchronising browse lists. */ struct browse_cache_record { ubi_dlNode node[1]; - nstring lmb_name; - nstring work_group; + fstring lmb_name; + fstring work_group; struct in_addr ip; time_t sync_time; time_t death_time; /* The time the record must be removed. */ @@ -265,9 +265,9 @@ struct work_record { enum logon_state log_state; /* Work group info. */ - nstring work_group; + fstring work_group; int token; /* Used when communicating with backup browsers. */ - nstring local_master_browser_name; /* Current local master browser. */ + fstring local_master_browser_name; /* Current local master browser. */ /* Announce info. */ time_t lastannounce_time; |