diff options
| author | Jeremy Allison <jra@samba.org> | 2004-03-11 22:48:24 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2004-03-11 22:48:24 +0000 |
| commit | 7b96765c23637613f079d37566d95d5edd511f05 (patch) | |
| tree | c68e7fbd16c0f8d8d7ae1e743f45c55c9d86d15e /source/smbd/message.c | |
| parent | d275c0e384db08c2a6efc28e52844f676ff71fb6 (diff) | |
| download | samba-7b96765c23637613f079d37566d95d5edd511f05.tar.gz samba-7b96765c23637613f079d37566d95d5edd511f05.tar.xz samba-7b96765c23637613f079d37566d95d5edd511f05.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.
Diffstat (limited to 'source/smbd/message.c')
| -rw-r--r-- | source/smbd/message.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/smbd/message.c b/source/smbd/message.c index 88f833e4686..f853a914753 100644 --- a/source/smbd/message.c +++ b/source/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') { |