X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Flibnfs.c;h=5754bfbc6489ad097050f204531e96e663a70a7a;hb=763cd6e3e2bbb6906186e7ed6a86660276b596b7;hp=8fe84b87313658c130bf4be3e2ead5e6201035a2;hpb=c985c015f2be8d3f87a4b89923c83755feb393f2;p=deb_libnfs.git

diff --git a/lib/libnfs.c b/lib/libnfs.c
index 8fe84b8..5754bfb 100644
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -37,6 +37,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <netinet/in.h>
+#include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-raw-mount.h"
@@ -1436,10 +1438,18 @@ static void nfs_mkdir_cb(struct rpc_context *rpc _U_, int status, void *command_
 static int nfs_mkdir_continue_internal(struct nfs_context *nfs, struct nfs_cb_data *data)
 {
 	char *str = data->continue_data;
-	
+	MKDIR3args args;
+
 	str = &str[strlen(str) + 1];
 
-	if (rpc_nfs_mkdir_async(nfs->rpc, nfs_mkdir_cb, &data->fh, str, data) != 0) {
+	memset(&args, 0, sizeof(MKDIR3args));
+	args.where.dir.data.data_len = data->fh.data.data_len;
+	args.where.dir.data.data_val = data->fh.data.data_val;
+	args.where.name = str;
+	args.attributes.mode.set_it = 1;
+	args.attributes.mode.set_mode3_u.mode = 0755;
+
+	if (rpc_nfs_mkdir_async(nfs->rpc, nfs_mkdir_cb, &args, data) != 0) {
 		rpc_set_error(nfs->rpc, "RPC error: Failed to send MKDIR call for %s", data->path);
 		data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
 		free_nfs_cb_data(data);
@@ -2412,7 +2422,12 @@ static void nfs_readlink_1_cb(struct rpc_context *rpc _U_, int status, void *com
 
 static int nfs_readlink_continue_internal(struct nfs_context *nfs, struct nfs_cb_data *data)
 {
-	if (rpc_nfs_readlink_async(nfs->rpc, nfs_readlink_1_cb, &data->fh, data) != 0) {
+	READLINK3args args;
+
+	args.symlink.data.data_len = data->fh.data.data_len; 
+	args.symlink.data.data_val = data->fh.data.data_val; 
+
+	if (rpc_nfs_readlink_async(nfs->rpc, nfs_readlink_1_cb, &args, data) != 0) {
 		rpc_set_error(nfs->rpc, "RPC error: Failed to send READLINK call for %s", data->path);
 		data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
 		free_nfs_cb_data(data);
@@ -2933,8 +2948,17 @@ static void nfs_symlink_cb(struct rpc_context *rpc _U_, int status, void *comman
 static int nfs_symlink_continue_internal(struct nfs_context *nfs, struct nfs_cb_data *data)
 {
 	struct nfs_symlink_data *symlink_data = data->continue_data;
+	SYMLINK3args sa;
+
+	memset(&sa, 0, sizeof(SYMLINK3args));
+	sa.where.dir.data.data_len = data->fh.data.data_len;
+	sa.where.dir.data.data_val = data->fh.data.data_val;
+	sa.where.name = symlink_data->newpathobject;
+	sa.symlink.symlink_attributes.mode.set_it = 1;
+	sa.symlink.symlink_attributes.mode.set_mode3_u.mode = S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IWGRP|S_IXGRP|S_IROTH|S_IWOTH|S_IXOTH;
+	sa.symlink.symlink_data = symlink_data->oldpath;
 
-	if (rpc_nfs_symlink_async(nfs->rpc, nfs_symlink_cb, &data->fh, symlink_data->newpathobject, symlink_data->oldpath, data) != 0) {
+	if (rpc_nfs_symlink_async(nfs->rpc, nfs_symlink_cb, &sa, data) != 0) {
 		rpc_set_error(nfs->rpc, "RPC error: Failed to send SYMLINK call for %s", data->path);
 		data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
 		free_nfs_cb_data(data);
@@ -3319,7 +3343,7 @@ uint64_t nfs_get_readmax(struct nfs_context *nfs)
  */
 uint64_t nfs_get_writemax(struct nfs_context *nfs)
 {
-	/* Some XDR libraries can not marshall PDUs bigger than this */
+	/* Some ZDR libraries can not marshall PDUs bigger than this */
         if (nfs->writemax < 32768) {
 		return nfs->writemax;
 	}
@@ -3525,3 +3549,7 @@ const char *nfs_get_export(struct nfs_context *nfs) {
 const struct nfs_fh3 *nfs_get_rootfh(struct nfs_context *nfs) {
       return &nfs->rootfh;
 }
+
+struct nfs_fh3 *nfs_get_fh(struct nfsfh *nfsfh) {
+       return &nfsfh->fh;
+}