From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Tue, 17 Dec 2013 14:34:23 +0000 (-0800)
Subject: Merge pull request #40 from plieven/master
X-Git-Tag: upstream/1.9.6^2~171
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=696a5074974bb8e3c07ddbb842aa77046e58341a;hp=1e7a5136dec5673bd3612a06b11ce2afaf8cf31a;p=deb_libnfs.git

Merge pull request #40 from plieven/master

minor fixes
---

diff --git a/lib/libnfs-zdr.c b/lib/libnfs-zdr.c
index 21cd9e1..f5e1a11 100644
--- a/lib/libnfs-zdr.c
+++ b/lib/libnfs-zdr.c
@@ -476,10 +476,12 @@ struct AUTH *libnfs_authunix_create(char *host, uint32_t uid, uint32_t gid, uint
 
 	size = 4 + 4 + ((strlen(host) + 3) & ~3) + 4 + 4 + 4 + len * 4;
 	auth = malloc(sizeof(struct AUTH));
+	memset(auth, 0x00, sizeof(struct AUTH));
 	auth->ah_cred.oa_flavor = AUTH_UNIX;
 	auth->ah_cred.oa_length = size;
 	auth->ah_cred.oa_base = malloc(size);
 
+	memset(auth->ah_cred.oa_base, 0x00, size);
 	buf = (uint32_t *)auth->ah_cred.oa_base;
 	idx = 0;
 	buf[idx++] = htonl(time(NULL));
diff --git a/lib/libnfs.c b/lib/libnfs.c
index 8a2f16f..2e3e7f2 100644
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -1868,7 +1868,7 @@ static void nfs_creat_1_cb(struct rpc_context *rpc, int status, void *command_da
 	if (res->status != NFS3_OK) {
 		rpc_set_error(nfs->rpc, "NFS: CREATE of %s/%s failed with %s(%d)", data->saved_path, str, nfsstat3_to_str(res->status), nfsstat3_to_errno(res->status));
 		data->cb(nfsstat3_to_errno(res->status), nfs, rpc_get_error(nfs->rpc), data->private_data);
-
+		free_nfs_cb_data(data);
 		return;
 	}
 
diff --git a/libnfs.pc.in b/libnfs.pc.in
index e7e3a91..fdc012c 100644
--- a/libnfs.pc.in
+++ b/libnfs.pc.in
@@ -12,4 +12,3 @@ Requires:
 Conflicts:
 Libs: -L${libdir} -lnfs
 Cflags: -I${includedir}
-Requires.private: @LIBNFS_PC_REQ_PRIVATE@