diff options
| author | Gerald Carter <jerry@samba.org> | 2006-01-24 20:20:50 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2006-01-24 20:20:50 +0000 |
| commit | 222149ff2dc2f5c742cb56b81a1c4b95b35d20a7 (patch) | |
| tree | a3d5295ee884a1c0fce5a5426dbff846dd3498ff /source/libsmb/climessage.c | |
| parent | 9f0ae032a85bf288ba49325c12dcd418a8e474e6 (diff) | |
| download | samba-222149ff2dc2f5c742cb56b81a1c4b95b35d20a7.tar.gz samba-222149ff2dc2f5c742cb56b81a1c4b95b35d20a7.tar.xz samba-222149ff2dc2f5c742cb56b81a1c4b95b35d20a7.zip | |
r13120: getting close to final release code.
The main things that will *not* be merged are
* lookupsid, name2sid(), et. al. work by Volker
* nmbd work (wins.tdb & removal of ubiqx dependencies)
* the toupper_ascii(), et. al. changes
* major changes from nsswitch/
* rename when DELETE_ON_CLOSE flag is set work
Please speak up if either a necesary change is
getting overlooked or a risky change is getting
included.
Diffstat (limited to 'source/libsmb/climessage.c')
| -rw-r--r-- | source/libsmb/climessage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/libsmb/climessage.c b/source/libsmb/climessage.c index f646096a4e5..1aa659c1ba3 100644 --- a/source/libsmb/climessage.c +++ b/source/libsmb/climessage.c @@ -85,7 +85,7 @@ int cli_message_text_build(struct cli_state *cli, char *msg, int len, int grp) p = smb_buf(cli->outbuf); *p++ = 1; - if ((lendos = (int)convert_string_allocate(NULL,CH_UNIX, CH_DOS, msg,len, (void **) &msgdos, True)) < 0 || !msgdos) { + if ((lendos = (int)convert_string_allocate(NULL,CH_UNIX, CH_DOS, msg,len, (void **)(void *)&msgdos, True)) < 0 || !msgdos) { DEBUG(3,("Conversion failed, sending message in UNIX charset\n")); SSVAL(p, 0, len); p += 2; memcpy(p, msg, len); |