sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s3-lib: restore truncating behavior of push_ascii_nstring()

Browse Source 
Some users of push_ascii_nstring() (notably name_to_unstring())
expect the output to be truncated if it would exceed the size of
an nstring after conversion. However this broke in 2011 due to
commit d546adeab5 ("Change convert_string_internal() and
convert_string_error() to bool return"). This patch restores the
old behavior.

The issue can be observed in syslog after setting the
``workgroup`` to a 16+ characters long string which triggers a
DEBUG() message:

    Oct 17 11:28:45 dev nmbd[11716]: name_to_nstring: workgroup name 0123456789ABCDEF0123456789ABCDEF is too long. Truncating to

Signed-off-by: Philipp Gesang <philipp.gesang@intra2net.com>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Noel Power <npower@samba.org>
Autobuild-Date(master): Tue Oct 25 16:25:40 UTC 2022 on sn-devel-184
This commit is contained in:
Philipp Gesang 2022-10-17 13:42:26 +02:00 committed by Noel Power
parent 4f63c12807
commit 0a66c73953
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/lib/fstring.c
View File

@ -41,8 +41,11 @@ size_t push_ascii_fstring(void *dest, const char *src)
size_t push_ascii_nstring(void *dest, const char *src)
{
size_t converted_size = 0;
bool ret = convert_string_error(CH_UNIX, CH_DOS, src, -1, dest, sizeof(nstring), &converted_size);
if (ret) {
bool ret;
errno = 0;
ret = convert_string_error(CH_UNIX, CH_DOS, src, -1, dest, sizeof(nstring), &converted_size);
if (ret || errno == E2BIG) {
SCVAL(dest, sizeof(nstring)-1, 0);
} else {
SCVAL(dest, 0, 0);