Home
My Posts

Archive
Login
Signup

Recent Posts

Free subdomains

Want your own xyz.kpaste.net sub-domain for your community? Just type the address into your browser address bar (foo.xyz.kpaste.net is also supported).

Suggestions/Bugs?

Email us at . Try to include as much info as possible.

About

Pastebin is a tool for collaborative debugging or editing.

 

msnfs41client: Patches for Solaris/Illumos nfsd setup doc, OP_READ_PLUS fix, relax GetReparsePoint check, 2025-03-26
Posted by Anonymous on Wed 26th Mar 2025 18:25
raw | new post

Submit a correction or amendment below (click here to make a fresh posting)
After submitting an amendment, you'll be able to view the differences between the old and new posts easily.

Syntax highlighting: None Bash C C++ CSS Diff HTML mIRC Script Perl PHP Python Smarty XML ---------------------------- ABAP Actionscript ADA Apache Log AppleScript APT sources.list ASM ASP AutoIT Bash C C# C++ C++ (with QT) CSS Diff HTML INI (Config Files) Java Javascript Lua Make mIRC Script MySQL NSIS Perl PHP Python Q(uick)BASIC robots Ruby Ruby on Rails SDLBasic Smarty SQL TCL Text VB.NET Visual BASIC Visual Fox Pro Visual Prolog Windows Registry Files XML Xorg.conf

To highlight particular lines, prefix each line with {%HIGHLIGHT}
From 4b53cb2ac410d2c0e05877ae3827204850625f59 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Wed, 26 Mar 2025 15:55:09 +0100 Subject: [PATCH 1/3] tests: NFS server setup: Document difference of /usr/sbin/share between Solaris 11.4 and Illumos NFS server setup: Document difference of /usr/sbin/share between Solaris 11.4 and Illumos. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- tests/nfs_server_setup.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/nfs_server_setup.txt b/tests/nfs_server_setup.txt index 6262fd0..df90d3d 100644 --- a/tests/nfs_server_setup.txt +++ b/tests/nfs_server_setup.txt @@ -63,7 +63,9 @@ sharectl set -p server_delegation=on nfs # ("NFSv4.1 server refuses creation of XATTR") mkdir -p /export/nfsdata chmod a+rwxt /export/nfsdata -share -p -F nfs -o rw /export/nfsdata +# Note: Solaris 11.4 $ share -F nfs ... # shares are persistent across +# reboots, Illumos needs $ share -p -F nfs ... # for that +share -F nfs -o rw /export/nfsdata # verify whether mapid and nfs/server are running svcs network/nfs/mapid @@ -110,6 +112,8 @@ sharectl set -p server_versmax=4.2 nfs # ("NFSv4.1 server refuses creation of XATTR") mkdir -p /export/nfsdata chmod a+rwxt /export/nfsdata +# Note: Solaris 11.4 $ share -F nfs ... # shares are persistent across +# reboots, Illumos needs $ share -p -F nfs ... # for that share -p -F nfs -o rw /export/nfsdata # verify whether mapid and nfs/server are running -- 2.45.1 From ea7d7e267078b41e963af97e556359d6989859de Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Wed, 26 Mar 2025 17:11:14 +0100 Subject: [PATCH 2/3] daemon: |nfs42_read_plus_content| should use an |union| for |data|/|hole| info |nfs42_read_plus_content| should use an |union| for |data|/|hole| info. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/nfs41_ops.h | 12 +++++++----- daemon/nfs42_xdr.c | 30 +++++++++++++++--------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/daemon/nfs41_ops.h b/daemon/nfs41_ops.h index 7e56cff..149bc08 100644 --- a/daemon/nfs41_ops.h +++ b/daemon/nfs41_ops.h @@ -755,11 +755,13 @@ typedef struct __nfs42_read_plus_args { typedef union __nfs42_read_plus_content { /* switch (data_content4 rpc_content) */ data_content4 content; - /* case NFS4_CONTENT_DATA: */ - data4 data; - /* case NFS4_CONTENT_HOLE: */ - data_info4 hole; - /* default: */ + union { + /* case NFS4_CONTENT_DATA: */ + data4 data; + /* case NFS4_CONTENT_HOLE: */ + data_info4 hole; + /* default: */ + } u; } nfs42_read_plus_content; typedef struct __nfs42_read_plus_res_ok { diff --git a/daemon/nfs42_xdr.c b/daemon/nfs42_xdr.c index 210adb1..c3367be 100644 --- a/daemon/nfs42_xdr.c +++ b/daemon/nfs42_xdr.c @@ -175,33 +175,33 @@ static bool_t decode_read_plus_res_ok( switch(co) { case NFS4_CONTENT_DATA: - if (!xdr_u_hyper(xdr, &contents[i].data.offset)) { + if (!xdr_u_hyper(xdr, &contents[i].u.data.offset)) { DPRINTF(0, ("i=%d, decoding 'offset' failed\n", (int)i)); return FALSE; } - if (!xdr_u_int32_t(xdr, &contents[i].data.count)) { + if (!xdr_u_int32_t(xdr, &contents[i].u.data.count)) { DPRINTF(0, ("i=%d, decoding 'count' failed\n", (int)i)); return FALSE; } - contents[i].data.data = res->data + - (contents[i].data.offset - res->args_offset); - contents[i].data.data_len = contents[i].data.count; + contents[i].u.data.data = res->data + + (contents[i].u.data.offset - res->args_offset); + contents[i].u.data.data_len = contents[i].u.data.count; - EASSERT(((contents[i].data.data - res->data) + - contents[i].data.data_len) <= res->data_len); + EASSERT(((contents[i].u.data.data - res->data) + + contents[i].u.data.data_len) <= res->data_len); if (!xdr_opaque(xdr, - (char *)contents[i].data.data, - contents[i].data.data_len)) { + (char *)contents[i].u.data.data, + contents[i].u.data.data_len)) { DPRINTF(0, ("i=%d, decoding 'bytes' failed\n", (int)i)); return FALSE; } read_data_len = __max(read_data_len, - ((size_t)(contents[i].data.data - res->data) + - contents[i].data.data_len)); + ((size_t)(contents[i].u.data.data - res->data) + + contents[i].u.data.data_len)); break; case NFS4_CONTENT_HOLE: unsigned char *hole_buff; @@ -209,15 +209,15 @@ static bool_t decode_read_plus_res_ok( DPRINTF(0, ("i=%d, 'NFS4_CONTENT_HOLE' content\n", (int)i)); - if (!xdr_u_hyper(xdr, &contents[i].hole.offset)) + if (!xdr_u_hyper(xdr, &contents[i].u.hole.offset)) return FALSE; - if (!xdr_u_hyper(xdr, &contents[i].hole.length)) + if (!xdr_u_hyper(xdr, &contents[i].u.hole.length)) return FALSE; hole_buff = res->data + - (contents[i].hole.offset - res->args_offset); - hole_length = contents[i].hole.length; + (contents[i].u.hole.offset - res->args_offset); + hole_length = contents[i].u.hole.length; /* * NFSv4.2 "READ_PLUS" is required to return the -- 2.45.1 From e6b1624c92939174c58cf59f9610dba2610dca9a Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Wed, 26 Mar 2025 18:31:05 +0100 Subject: [PATCH 3/3] sys: |nfs41_GetSymlinkReparsePoint()| should return |STATUS_NOT_A_REPARSE_POINT| for non-symlink files in all cases Remove |is_root_directory()| check from |check_nfs41_getsymlinkreparse_args()| to make sure |nfs41_GetSymlinkReparsePoint()| can return |STATUS_NOT_A_REPARSE_POINT| for non-symlink files in all cases. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- sys/nfs41sys_symlink.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sys/nfs41sys_symlink.c b/sys/nfs41sys_symlink.c index 51c6720..ead2e96 100644 --- a/sys/nfs41sys_symlink.c +++ b/sys/nfs41sys_symlink.c @@ -433,14 +433,6 @@ NTSTATUS check_nfs41_getsymlinkreparse_args( const USHORT HeaderLen = FIELD_OFFSET(REPARSE_DATA_BUFFER, SymbolicLinkReparseBuffer.PathBuffer); - /* must have a filename longer than vnetroot name, - * or it's trying to operate on the volume itself */ - if (is_root_directory(RxContext)) { - status = STATUS_INVALID_PARAMETER; - DbgP("check_nfs41_getsymlinkreparse_args: " - "is_root_directory() == TRUE\n"); - goto out; - } /* ifs reparse tests expect STATUS_INVALID_PARAMETER, * but 'dir' passes a buffer here when querying symlinks if (FsCtl->pInputBuffer != NULL) { -- 2.45.1

Title:

Privacy: Public Private

How long should your post be retained?

15 mins an hour a day a week a month forever

All content is user-submitted.
The administrators of this site (kpaste.net) are not responsible for their content.
Abuse reports should be emailed to us at