diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-05-05 21:13:40 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:21:46 -0500 |
| commit | fb5644342760cb54b4285c65ab36d693f558a289 (patch) | |
| tree | 7d2d41ebb8082e45f22a5820854fa3d614e6cc97 | |
| parent | 1bcee2679d66f98932d800d6c88b70aeb7691b82 (diff) | |
| download | samba-fb5644342760cb54b4285c65ab36d693f558a289.tar.gz samba-fb5644342760cb54b4285c65ab36d693f558a289.tar.bz2 samba-fb5644342760cb54b4285c65ab36d693f558a289.zip | |
r22691: Fix a 64-bit warning and a const const discard warning
(This used to be commit 3a2ca1b1b85e268928587287f61d26f992b303a5)
| -rw-r--r-- | source3/smbd/dmapi.c | 3 | ||||
| -rw-r--r-- | source3/smbd/process.c | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/dmapi.c b/source3/smbd/dmapi.c index b8c23c2dce..23b5d5e947 100644 --- a/source3/smbd/dmapi.c +++ b/source3/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/source3/smbd/process.c b/source3/smbd/process.c index 16c1d80c0f..44baa96059 100644 --- a/source3/smbd/process.c +++ b/source3/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); } |