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

diff --git a/configure.ac b/configure.ac
index a966d518c9adf8d058cd36ab7c21526b888e36cb..37a44a3a7d506745280d53d3de9fce76a60e39c3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.50)
-AC_INIT([libnfs], [1.3.0], [ronniesahlberg@gmail.com])
+AC_INIT([libnfs], [1.4.0], [ronniesahlberg@gmail.com])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign])
 AC_CANONICAL_HOST

diff --git a/lib/Makefile.am b/lib/Makefile.am
index d0bd7fcfa66430571171c589a9b5ad8d00ecba27..1b5a66fb4411d44dc8f13b4d3b4ba6d20e0fbb6b 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -16,7 +16,7 @@ libnfs_la_SOURCES = \
        pdu.c \
        socket.c
 
-libnfs_la_LDFLAGS = -version-info 1:3:0
+libnfs_la_LDFLAGS = -version-info 1:4:0
 libnfs_la_LIBADD = \
        ../mount/libmount.la \
        ../nfs/libnfs.la \

diff --git a/lib/socket.c b/lib/socket.c
index 1ba846a1c8151893a8b2237bd8c0f06afa2faa99..83ca50e1765ad365a6f67650edcb01119a133bea 100644 (file)
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -143,6 +143,8 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 
        assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
+       assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 #if defined(WIN32)
        if (ioctlsocket(rpc->fd, FIONREAD, &available) != 0) {
 #else

diff --git a/nfs/nfs.x b/nfs/nfs.x
index c259aa6e3cf3ff6dc7b96f3d34dc60b095f1951c..6e2d7a47d6bd9f044cfd762565bea6a1eec4615d 100644 (file)
--- a/nfs/nfs.x
+++ b/nfs/nfs.x
@@ -7,8 +7,7 @@ const NFS3_COOKIEVERFSIZE = 8;
 
 typedef opaque cookieverf3[NFS3_COOKIEVERFSIZE];
 
-
-/*unsigned hyper can be overridden by giving rpcgen -DU_INT64_PLATTFORM_TYPE="foo" - for plattforms
+/*unsigned hyper can be overridden by giving rpcgen -DU_INT64_PLATTFORM_TYPE="
   where rpcgen doesn't know anything about hyper
   default to unsigned hyper as of rfc 1813 */
 #ifndef U_INT64_PLATTFORM_TYPE
@@ -16,6 +15,7 @@ typedef opaque cookieverf3[NFS3_COOKIEVERFSIZE];
 #endif/*U_INT64_PLATTFORM_TYPE*/
 
 typedef U_INT64_PLATTFORM_TYPE uint64;
+
 typedef uint64 cookie3;
 
 struct nfs_fh3 {

diff --git a/nlm/nlm.x b/nlm/nlm.x
index 4ca86218e8be8cc64f6b39ba429adae3da053693..8ec6614ddb8ac714d8580b2235d1b7a0175504fc 100644 (file)
--- a/nlm/nlm.x
+++ b/nlm/nlm.x
@@ -1,5 +1,6 @@
 /* based on rfc1813 and wireshark */
 
+typedef unsigned hyper uint64;
 
 struct nlm_fh4 {
        opaque       data<>;
@@ -28,8 +29,8 @@ struct nlm4_holder {
        bool           exclusive;
        unsigned int   svid;
        nlm4_oh        oh;
-       unsigned hyper l_offset;
-       unsigned hyper l_len;
+       uint64         l_offset;
+       uint64         l_len;
 };
 
 const NLM_MAXNAME = 256;
@@ -38,8 +39,8 @@ struct nlm4_lock {
        struct nlm_fh4 fh;
        nlm4_oh        oh;
        unsigned int   svid;
-       unsigned hyper l_offset;
-       unsigned hyper l_len;
+       uint64         l_offset;
+       uint64         l_len;
 };
 
 struct nlm4_share {

diff --git a/packaging/RPM/libnfs.spec.in b/packaging/RPM/libnfs.spec.in
index b4e313a1d84101ec1156e447d6a057690e287932..53e1ed925d4ab9c5cc1f2b50c57f93a2ee91b56a 100644 (file)
--- a/packaging/RPM/libnfs.spec.in
+++ b/packaging/RPM/libnfs.spec.in
@@ -94,6 +94,14 @@ development libraries for LibNFS
 %{_libdir}/pkgconfig/libnfs.pc
 
 %changelog
+* Sun Nov 25 2012 : Version 1.4
+ - Add trackig of freed context and assert on using a context after it has been
+   freed.
+ - Windows x64 support and fixes.
+ - Switch to using our own version of xdr_int64() since the one in libtirpc
+   crashes on some platforms.
+ - Fix memory leak in an error path for addrinfo.
+ - Fix bug dereferencing a null pointer in the mount callback on error.
 * Sat Mar 3 2012 : Version 1.3
  - add set/unset to portmapper
  - add mount v1