diff options
author | Gerald Carter <jerry@samba.org> | 2005-09-30 17:13:37 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:04:48 -0500 |
commit | 939c3cb5d78e3a2236209b296aa8aba8bdce32d3 (patch) | |
tree | 5f3a22ba40783ce548328a44b9262a451f33ad27 /source/lib/tallocmsg.c | |
parent | f049fd463b087ccf4873b03675cca5eb8576af2e (diff) | |
download | samba-939c3cb5d78e3a2236209b296aa8aba8bdce32d3.tar.gz samba-939c3cb5d78e3a2236209b296aa8aba8bdce32d3.tar.xz samba-939c3cb5d78e3a2236209b296aa8aba8bdce32d3.zip |
r10656: BIG merge from trunk. Features not copied over
* \PIPE\unixinfo
* winbindd's {group,alias}membership new functions
* winbindd's lookupsids() functionality
* swat (trunk changes to be reverted as per discussion with Deryck)
Diffstat (limited to 'source/lib/tallocmsg.c')
-rw-r--r-- | source/lib/tallocmsg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/lib/tallocmsg.c b/source/lib/tallocmsg.c index 8ee3c257f6b..8f03fd66ff1 100644 --- a/source/lib/tallocmsg.c +++ b/source/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); |