summaryrefslogtreecommitdiff
path: root/source3/nmbd/nmbd_nameregister.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-03-15 21:45:45 +0000
committerJeremy Allison <jra@samba.org>2004-03-15 21:45:45 +0000
commitce0c99312c7da78679357610730ba5b60f4319b9 (patch)
treeb1b35c4e6bb6ab27e5d945f86fded1b86bc8daff /source3/nmbd/nmbd_nameregister.c
parent96c66b7be726b2361f18edde01d7b71e124e33e7 (diff)
downloadsamba-ce0c99312c7da78679357610730ba5b60f4319b9.tar.gz
samba-ce0c99312c7da78679357610730ba5b60f4319b9.tar.bz2
samba-ce0c99312c7da78679357610730ba5b60f4319b9.zip
Use "unix netbios name" type unstring - 64 bytes long to manipulate netbios
names in nmbd. Allows conversion from dos codepage mb strings (ie. SJIS) to expand to utf8 size on read. Jeremy. (This used to be commit 834d816caf9cd6318da00febde50d9233469dac2)
Diffstat (limited to 'source3/nmbd/nmbd_nameregister.c')
-rw-r--r--source3/nmbd/nmbd_nameregister.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/nmbd/nmbd_nameregister.c b/source3/nmbd/nmbd_nameregister.c
index 4fbdd143e1..4e11881f06 100644
--- a/source3/nmbd/nmbd_nameregister.c
+++ b/source3/nmbd/nmbd_nameregister.c
@@ -85,7 +85,7 @@ static void register_name_response(struct subnet_record *subrec,
*/
#if 1 /* OLD_SAMBA_SERVER_HACK */
- fstring ans_name;
+ unstring ans_name;
pull_ascii_nstring(ans_name, sizeof(ans_name), answer_name->name);
if((nmb->header.rcode == ACT_ERR) && strequal(lp_workgroup(), ans_name) &&
(answer_name->name_type == 0x1b)) {
@@ -418,7 +418,7 @@ static void multihomed_register_name(struct nmb_name *nmbname, uint16 nb_flags,
struct subnet_record *subrec;
char **wins_tags;
struct in_addr *ip_list;
- fstring name;
+ unstring name;
for(subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec) )
num_ips++;
@@ -476,7 +476,7 @@ void register_name(struct subnet_record *subrec,
errno = 0;
push_ascii_nstring(nname, name);
if (errno == E2BIG) {
- fstring tname;
+ unstring tname;
pull_ascii_nstring(tname, sizeof(tname), nname);
DEBUG(0,("register_name: NetBIOS name %s is too long. Truncating to %s\n",
name, tname));