From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Wed, 28 Nov 2012 02:22:27 +0000 (-0800)
Subject: Merge branch 'zdr'
X-Git-Tag: upstream/1.9.6^2~242
X-Git-Url: https://git.piment-noir.org/?p=deb_libnfs.git;a=commitdiff_plain;h=f816bf4c7641071d83ed2c796c93ce0ddba9b3b4

Merge branch 'zdr'

Manually fixyp some merge conflicts in :
	lib/init.c
	lib/pdu.c
	lib/socket.c
	nfs/Makefile.am
	nfs/nfs.x
	nlm/Makefile.am
---

f816bf4c7641071d83ed2c796c93ce0ddba9b3b4
diff --cc lib/socket.c
index 413ebbe,1ba846a..83ca50e
--- a/lib/socket.c
+++ b/lib/socket.c
@@@ -140,10 -139,10 +139,12 @@@ static int rpc_read_from_socket(struct 
  	int available;
  	int size;
  	int pdu_size;
- 	int64_t count;
+ 	int32_t count;
+ 
+ 	assert(rpc->magic == RPC_CONTEXT_MAGIC);
  
 +	assert(rpc->magic == RPC_CONTEXT_MAGIC);
 +
  #if defined(WIN32)
  	if (ioctlsocket(rpc->fd, FIONREAD, &available) != 0) {
  #else