diff options
| author | Jeremy Allison <jra@samba.org> | 2004-03-11 22:59:58 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2004-03-11 22:59:58 +0000 |
| commit | 39c731347045dc345862d527871ae5b9a4619e74 (patch) | |
| tree | 1efcc9c3ea2080a20b4bc52bf0b08a69c161b847 /source3/smbd/message.c | |
| parent | 77b180d401b1f431dd550a8498b83bdb24cd7325 (diff) | |
| download | samba-39c731347045dc345862d527871ae5b9a4619e74.tar.gz samba-39c731347045dc345862d527871ae5b9a4619e74.tar.bz2 samba-39c731347045dc345862d527871ae5b9a4619e74.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 3b4fca7b7f410cb0f11322e22c8f26a662eff941)
Diffstat (limited to 'source3/smbd/message.c')
| -rw-r--r-- | source3/smbd/message.c | 2 |
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') { |