sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-25 06:04:04 +03:00
Code

lib/util/charset: fix conversion failure logging

Browse Source 
Move catch-all debug statement with loglevel 0 from behind the switch
clause into the switch clause as default case. Fixes an issue that
resulted in the log being flooded with level 0 messages in case someone
put a file with an illegal UTF8 encoding (eg '\xA0test') on the server.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Ralph Boehme 2015-06-03 16:58:22 +02:00 committed by Jeremy Allison
parent b26a1449a0
commit 1c60dc5c32
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/util/charset/convert_string.c
View File

@ -434,8 +434,10 @@ bool convert_string_talloc_handle(TALLOC_CTX *ctx, struct smb_iconv_handle *ic,
reason="Illegal multibyte sequence"; reason="Illegal multibyte sequence";
DEBUG(3,("convert_string_talloc: Conversion error: %s(%s)\n",reason,inbuf)); DEBUG(3,("convert_string_talloc: Conversion error: %s(%s)\n",reason,inbuf));
break; break;
} default:
DEBUG(0,("Conversion error: %s(%s)\n",reason,inbuf)); DEBUG(0,("Conversion error: %s(%s)\n",reason,inbuf));
break;
}
/* smb_panic(reason); */ /* smb_panic(reason); */
TALLOC_FREE(ob); TALLOC_FREE(ob);
return false; return false;