diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2003-03-20 16:42:39 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2003-03-20 16:42:39 +0000 |
| commit | c7e720c87bf1dae8ec4ca4bad47a7324c89b7c05 (patch) | |
| tree | 69da232c0fd7c081cd80122deacc2e1962946915 /source3/libsmb/climessage.c | |
| parent | 9ba6be2e703e92971c8102f55fd840ef24ecf208 (diff) | |
| download | samba-c7e720c87bf1dae8ec4ca4bad47a7324c89b7c05.tar.gz samba-c7e720c87bf1dae8ec4ca4bad47a7324c89b7c05.tar.bz2 samba-c7e720c87bf1dae8ec4ca4bad47a7324c89b7c05.zip | |
Patch from Samuel Thibault to convert messages from unix to dos charset. Works
on 2000.
sending messages to 9x needs to be fixed, but that didn't work anyway
(This used to be commit ca066502a2a3dbdd8943d515c9c6d21e62d757b6)
Diffstat (limited to 'source3/libsmb/climessage.c')
| -rw-r--r-- | source3/libsmb/climessage.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/source3/libsmb/climessage.c b/source3/libsmb/climessage.c index 1587e6f4cd..5f6ce36133 100644 --- a/source3/libsmb/climessage.c +++ b/source3/libsmb/climessage.c @@ -65,6 +65,8 @@ send a message ****************************************************************************/ BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp) { + char *msgdos; + int lendos; char *p; memset(cli->outbuf,'\0',smb_size); @@ -77,9 +79,18 @@ BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp) p = smb_buf(cli->outbuf); *p++ = 1; - SSVAL(p,0,len); p += 2; - memcpy(p,msg,len); - p += len; + + if ((lendos = convert_string_allocate(CH_UNIX, CH_DOS, msg,len, (void **) &msgdos)) < 0 || !msgdos) { + DEBUG(3,("Conversion failed, sending message in UNIX charset\n")); + SSVAL(p, 0, len); p += 2; + memcpy(p, msg, len); + p += len; + } else { + SSVAL(p, 0, lendos); p += 2; + memcpy(p, msgdos, lendos); + p += lendos; + SAFE_FREE(msgdos); + } cli_setup_bcc(cli, p); cli_send_smb(cli); |