r10656: BIG merge from trunk. Features not copied over

[samba.git] / source3 / lib / tallocmsg.c

diff --git a/source3/lib/tallocmsg.c b/source3/lib/tallocmsg.c
index 8ee3c257f6b642723a795de60e36076aac946fd4..8f03fd66ff1888749bccb9cd26598a1d8660cb83 100644 (file)
--- a/source3/lib/tallocmsg.c
+++ b/source3/lib/tallocmsg.c
@@ -30,7 +30,7 @@
  * Respond to a POOL_USAGE message by sending back string form of memory
  * usage stats.
  **/
-void msg_pool_usage(int msg_type, pid_t src_pid,
+void msg_pool_usage(int msg_type, struct process_id src_pid,
                    void *UNUSED(buf), size_t UNUSED(len))
 {
        off_t reply;
@@ -41,7 +41,7 @@ void msg_pool_usage(int msg_type, pid_t src_pid,
        DEBUG(2,("Got POOL_USAGE\n"));
 
        reply = talloc_total_size(NULL);
-       fstr_sprintf(reply_str, "%lld", reply);
+       fstr_sprintf(reply_str, "%ld", (long)reply);
        
        message_send_pid(src_pid, MSG_POOL_USAGE,
                         reply_str, strlen(reply_str)+1, True);