r22691: Fix a 64-bit warning and a const const discard warning

diff --git a/source/smbd/dmapi.c b/source/smbd/dmapi.c
index b8c23c2dce641f81c308cb56b75a66f4e674ac4e..23b5d5e947a20c2a0cffd3472d6165547c17c692 100644 (file)
--- 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 16c1d80c0f7af8413435de261ed429ec761aaec0..44baa96059fa5fbe1234c4472f082fa62b9a9dd8 100644 (file)
--- 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);
        }