From 72ad91de776f74d4825ea08d458a9490fe33bfdb Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 28 Oct 2014 11:55:30 -0700 Subject: [PATCH] s3: nmbd : netbios name truncating doesn't work Fix bug #10896: netbios name truncating doesn't work. Try and cope with truncation more intelligently. https://bugzilla.samba.org/show_bug.cgi?id=10896 Signed-off-by: Jeremy Allison --- source3/nmbd/nmbd_nameregister.c | 66 +++++++++++++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 8 deletions(-) diff --git a/source3/nmbd/nmbd_nameregister.c b/source3/nmbd/nmbd_nameregister.c index 71c4751..56c907b 100644 --- a/source3/nmbd/nmbd_nameregister.c +++ b/source3/nmbd/nmbd_nameregister.c @@ -484,15 +484,65 @@ void register_name(struct subnet_record *subrec, nstring nname; errno = 0; - push_ascii_nstring(nname, name); - if (errno == E2BIG) { - 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)); - make_nmb_name(&nmbname, tname, type); - } else { + if (push_ascii_nstring(nname, name)!=(size_t)-1) { + /* Success. */ make_nmb_name(&nmbname, name, type); + } else if (errno == E2BIG) { + /* + * Name converted to CH_DOS is too large. + * try to truncate. + */ + char *converted_str_dos = NULL; + char *converted_str_unix = NULL; + size_t converted_size = 0; + if (!convert_string_talloc(talloc_tos(), + CH_UNIX, + CH_DOS, + name, + strlen(name)+1, + &converted_str_dos, + &converted_size)) { + DEBUG(0,("register_name: NetBIOS name %s cannot be " + "converted. Failing to register name.\n", + name)); + return; + } + + /* + * As it's now CH_DOS codepage + * we truncate by writing '\0' at + * MAX_NETBIOSNAME_LEN-1 and then + * convert back to CH_UNIX which we + * need for the make_nmb_name() call. + */ + if (converted_size >= MAX_NETBIOSNAME_LEN) { + converted_str_dos[MAX_NETBIOSNAME_LEN-1] = '\0'; + } + if (!convert_string_talloc(talloc_tos(), + CH_DOS, + CH_UNIX, + converted_str_dos, + strlen(converted_str_dos)+1, + &converted_str_unix, + &converted_size)) { + DEBUG(0,("register_name: NetBIOS name %s cannot be " + "converted back to CH_UNIX. " + "Failing to register name.\n", + converted_str_dos)); + TALLOC_FREE(converted_str_dos); + return; + } + make_nmb_name(&nmbname, converted_str_unix, type); + TALLOC_FREE(converted_str_dos); + TALLOC_FREE(converted_str_unix); + } else { + /* + * Generic conversion error. Fail to register. + */ + DEBUG(0,("register_name: NetBIOS name %s cannot be " + "converted (%s). Failing to register name.\n", + name, strerror(errno))); + return; } /* Always set the NB_ACTIVE flag on the name we are -- 2.1.0.rc2.206.gedb03e5