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 | 54abd2aa66069e6baf7769c496f46d9dba18db39 (patch) | |
tree | 9cf8e88168011797319ba9e9866749201b1eac1e /source3/nmbd/nmbd_packets.c | |
parent | 4a2cc231d22a82ed21771a72508f15d21ed63227 (diff) | |
download | samba-54abd2aa66069e6baf7769c496f46d9dba18db39.tar.gz samba-54abd2aa66069e6baf7769c496f46d9dba18db39.tar.bz2 samba-54abd2aa66069e6baf7769c496f46d9dba18db39.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)
(This used to be commit 939c3cb5d78e3a2236209b296aa8aba8bdce32d3)
Diffstat (limited to 'source3/nmbd/nmbd_packets.c')
-rw-r--r-- | source3/nmbd/nmbd_packets.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c index 4baf2d3d6c..c25473c4fb 100644 --- a/source3/nmbd/nmbd_packets.c +++ b/source3/nmbd/nmbd_packets.c @@ -1246,7 +1246,7 @@ packet sent to name %s from IP %s\n", packet sent to name %s from IP %s\n", dgram->datasize, len, - PTR_DIFF(buf2, dgram->data), + (int)PTR_DIFF(buf2, dgram->data), nmb_namestr(&dgram->dest_name), inet_ntoa(p->ip) )); return; @@ -1257,7 +1257,7 @@ packet sent to name %s from IP %s\n", packet sent to name %s from IP %s\n", dgram->datasize, len, - PTR_DIFF(buf2, dgram->data), + (int)PTR_DIFF(buf2, dgram->data), nmb_namestr(&dgram->dest_name), inet_ntoa(p->ip) )); return; |