summaryrefslogtreecommitdiff
path: root/source3/smbd/message.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-03-11 22:48:24 +0000
committerJeremy Allison <jra@samba.org>2004-03-11 22:48:24 +0000
commite3f5b542707e2328030b9d5eff0836a904eccde5 (patch)
tree13124522e17aa9464fa9e4b965f6b34112af0307 /source3/smbd/message.c
parent3d18997afda94504e9db24115aaa56a58086a653 (diff)
downloadsamba-e3f5b542707e2328030b9d5eff0836a904eccde5.tar.gz
samba-e3f5b542707e2328030b9d5eff0836a904eccde5.tar.bz2
samba-e3f5b542707e2328030b9d5eff0836a904eccde5.zip
Restore the contract on all convert_stringXX() interfaces. Add a "allow_bad_conv"
boolean parameter that allows broken iconv conversions to work. Gets rid of the nasty errno checks in mangle_hash2 and check_path_syntax and allows correct return code checking. Jeremy. (This used to be commit 7b96765c23637613f079d37566d95d5edd511f05)
Diffstat (limited to 'source3/smbd/message.c')
-rw-r--r--source3/smbd/message.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/message.c b/source3/smbd/message.c
index 88f833e468..f853a91475 100644
--- a/source3/smbd/message.c
+++ b/source3/smbd/message.c
@@ -64,7 +64,7 @@ static void msg_deliver(void)
* Incoming message is in DOS codepage format. Convert to UNIX.
*/
- if ((len = convert_string_allocate(NULL,CH_DOS, CH_UNIX, msgbuf, msgpos, (void **) &msg)) < 0 || !msg) {
+ if ((len = (int)convert_string_allocate(NULL,CH_DOS, CH_UNIX, msgbuf, msgpos, (void **) &msg, True)) < 0 || !msg) {
DEBUG(3,("Conversion failed, delivering message in DOS codepage format\n"));
for (i = 0; i < msgpos;) {
if (msgbuf[i] == '\r' && i < (msgpos-1) && msgbuf[i+1] == '\n') {