summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-05-05 21:13:40 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:21:46 -0500
commit3a2ca1b1b85e268928587287f61d26f992b303a5 (patch)
tree50a7615ac78c8eea91bf7b41af299fa98f8ea995 /source
parent8e0e278961ebf2fa4301874d522636699ace1b9b (diff)
downloadsamba-3a2ca1b1b85e268928587287f61d26f992b303a5.tar.gz
samba-3a2ca1b1b85e268928587287f61d26f992b303a5.tar.xz
samba-3a2ca1b1b85e268928587287f61d26f992b303a5.zip
r22691: Fix a 64-bit warning and a const const discard warning
Diffstat (limited to 'source')
-rw-r--r--source/smbd/dmapi.c3
-rw-r--r--source/smbd/process.c7
2 files changed, 5 insertions, 5 deletions
diff --git a/source/smbd/dmapi.c b/source/smbd/dmapi.c
index b8c23c2dce6..23b5d5e947a 100644
--- a/source/smbd/dmapi.c
+++ b/source/smbd/dmapi.c
@@ -152,7 +152,8 @@ retry:
/* No session already defined. */
if (dmapi_session == DM_NO_SESSION) {
- err = dm_create_session(DM_NO_SESSION, DMAPI_SESSION_NAME,
+ err = dm_create_session(DM_NO_SESSION,
+ CONST_DISCARD(DMAPI_SESSION_NAME),
&dmapi_session);
if (err < 0) {
DEBUGADD(DMAPI_TRACE,
diff --git a/source/smbd/process.c b/source/smbd/process.c
index 16c1d80c0f7..44baa96059f 100644
--- a/source/smbd/process.c
+++ b/source/smbd/process.c
@@ -1211,10 +1211,9 @@ int chain_reply(char *inbuf,char *outbuf,int size,int bufsize)
/* work out the new size for the in buffer. */
new_size = size - (inbuf2 - inbuf);
if (new_size < 0) {
- DEBUG(0,("chain_reply: chain packet size incorrect (orig size = %d, "
- "offset = %d)\n",
- size,
- (inbuf2 - inbuf) ));
+ DEBUG(0,("chain_reply: chain packet size incorrect "
+ "(orig size = %d, offset = %d)\n",
+ size, (int)(inbuf2 - inbuf) ));
exit_server_cleanly("Bad chained packet");
return(-1);
}