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 inheritance ACE flags, nfs_ea utility+misc, 2024-06-26
Posted by Anonymous on Wed 26th Jun 2024 17:28
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 411563658b3a9a1e5f87def47b3b40be5a7985aa Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Wed, 26 Jun 2024 12:23:09 +0200 Subject: [PATCH 1/4] daemon,tests: setacl should clear |ACE4_INHERITED_ACE| per RFC8884 setacl should clear |ACE4_INHERITED_ACE| per RFC8884 Section-6.2.1.4.1 This fixes |NFS4ERR_ATTRNOTSUPP| on directories which have default/inheritance ACLs. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/acl.c | 38 +++++++++++++++++++++++++++++++++----- tests/manual_testing.txt | 12 +++++++++++- 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/daemon/acl.c b/daemon/acl.c index 73c1c7a..331fc8e 100644 --- a/daemon/acl.c +++ b/daemon/acl.c @@ -673,12 +673,13 @@ void map_winaccessmask2nfs4acemask(ACCESS_MASK win_mask, } #if 1 - /* Compare old and new code */ - EASSERT_MSG(((long)*nfs4_mask == (long)(win_mask /*& 0x00ffffff*/)), + /* DEBUG: Compare old and new code */ + DASSERT_MSG(0, + ((long)*nfs4_mask == (long)(win_mask & 0x00ffffff)), ("map_winaccessmask2nfs4acemask: " "new code nfs4_mask=0x%lx, " "old code nfs4_mask=0x%lx\n", - (long)*nfs4_mask, (long)(win_mask /*& 0x00ffffff*/))); + (long)*nfs4_mask, (long)(win_mask & 0x00ffffff))); #endif } @@ -837,12 +838,13 @@ void map_nfs4acemask2winaccessmask(uint32_t nfs4_mask, } #if 1 - /* Compare old and new code */ + /* DEBUG: Compare old and new code */ #ifdef MAP_WIN32GENERIC2ACE4GENERIC if (!is_generic) #endif /* MAP_WIN32GENERIC2ACE4GENERIC */ { - EASSERT_MSG(((long)*win_mask == (long)(nfs4_mask /*& 0x00ffffff*/)), + DASSERT_MSG(0, + ((long)*win_mask == (long)(nfs4_mask /*& 0x00ffffff*/)), ("#### map_nfs4acemask2winaccessmask: " "new code win_mask=0x%lx, " "old code win_mask=0x%lx\n", @@ -1081,6 +1083,32 @@ static int map_dacl_2_nfs4acl(PACL acl, PSID sid, PSID gsid, nfsacl41 *nfs4_acl, file_type, named_attr_support, &nfs4_acl->aces[i].acemask); + /* + * Clear |ACE4_INHERITED_ACE| + * + * (See RFC 8884 Section-6.2.1.4.1: + * ACE4_INHERITED_ACE + * Indicates that this ACE is inherited from a parent + * directory. A server that supports automatic inheritance + * will place this flag on any ACEs inherited from the + * parent directory when creating a new object. + * Client applications will use this to perform automatic + * inheritance. Clients and servers MUST clear this bit in + * the acl attribute; it may only be used in the dacl and + * sacl attributes. + * ---- snip ---- + * ) + * + * If we do not clear this bit Linux 6.6.32-RT32 nfsd + * will reject setting ACLs |NFS4ERR_ATTRNOTSUPP| via + * icacls(1win) if the parent directory has inheritance + * ACLs. + */ + if (nfs4_acl->aces[i].aceflag & ACE4_INHERITED_ACE) { + nfs4_acl->aces[i].aceflag &= ~ACE4_INHERITED_ACE; + DPRINTF(ACLLVL3, ("clearning ACE4_INHERITED_ACE\n")); + } + /* * Treat |SidTypeAlias| as (local) group * diff --git a/tests/manual_testing.txt b/tests/manual_testing.txt index 9402886..2ab20f2 100644 --- a/tests/manual_testing.txt +++ b/tests/manual_testing.txt @@ -1,5 +1,5 @@ # -# ms-nfs41-client manual testing sequence, 2024-05-21 +# ms-nfs41-client manual testing sequence, 2024-06-26 # # Draft version, needs to be turned into automated tests # if possible @@ -155,6 +155,16 @@ $ ksh93 -c 'set -o xtrace ; rm -f test1.txt ; touch test1.txt ; icacls test1.txt # Expectation: The ACL entry for user "siegfried_wulsch" should have the "GW" flag set +# +# Test for default (inheritance) ACLs: +# +mkdir test1 +cd test1 +icacls . /grant "cygwingrp2:(OI)(CI)(IO)(GR)" +touch mytestfile1.txt +icacls mytestfile1.txt | grep --colour -E 'cygwingrp2.+GR' +# file "mytestfile1.txt" must have the "GR" flag set + # # Compile each of the following package # on a NFSv4.1 share, and run each build in parallel/sequence -- 2.45.1 From 16a9817c421f4fdc3fe6d55ce8dc4dba45b11dd8 Mon Sep 17 00:00:00 2001 From: Cedric Blancher <cedric.blancher@gmail.com> Date: Wed, 26 Jun 2024 12:42:47 +0200 Subject: [PATCH 2/4] cygwin: msnfs41client: Killing DrMemory with <CTRL-C> does not terminate nfsd_debug msnfs41client: Killing DrMemory with <CTRL-C> does not terminate nfsd_debug.exe, which can lead to confusion. Better use taskkill to explicitly terminate nfsd_debug.exe in this case. Signed-off-by: Roland Mainz <roland.mainz@nrubsig.org> --- cygwin/devel/msnfs41client.bash | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cygwin/devel/msnfs41client.bash b/cygwin/devel/msnfs41client.bash index c83dcfc..34a9634 100644 --- a/cygwin/devel/msnfs41client.bash +++ b/cygwin/devel/msnfs41client.bash @@ -320,6 +320,11 @@ function nfsclient_rundeamon "${nfsd_args[@]}" '--crtdbgmem' 'none' ) + + # Killing DrMemory with <CTRL-C> does not terminate nfsd, + # so we have to do it ourselves + trap 'taskkill /F /IM nfsd_debug.exe' SIGINT SIGTERM + "${nfsd_args[@]}" elif false ; then typeset -i vsdiagnostics_id=50 @@ -439,6 +444,10 @@ function nfsclient_system_rundeamon "${nfsd_args[@]}" ) + # Killing DrMemory with <CTRL-C> does not terminate nfsd, + # so we have to do it ourselves + trap 'taskkill /F /IM nfsd_debug.exe' SIGINT SIGTERM + "${nfsd_args[@]}" elif false ; then typeset -i vsdiagnostics_id=50 -- 2.45.1 From 4c49e09f1d2dbd7009d40dc0a773066426d18abf Mon Sep 17 00:00:00 2001 From: Cedric Blancher <cedric.blancher@gmail.com> Date: Wed, 26 Jun 2024 13:13:58 +0200 Subject: [PATCH 3/4] daemon: DPRINTF()&co should save&restore GetLastError() code DPRINTF()&co should save&restore GetLastError() code Signed-off-by: Roland Mainz <roland.mainz@nrubsig.org> --- daemon/daemon_debug.h | 45 +++++++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/daemon/daemon_debug.h b/daemon/daemon_debug.h index 3b376f0..c6f48a9 100644 --- a/daemon/daemon_debug.h +++ b/daemon/daemon_debug.h @@ -56,36 +56,55 @@ #define EASSERT(exp) \ if (!(exp)) { \ + DWORD d_saved_lasterr = GetLastError(); \ eprintf("ASSERTION '%s' in '%s'/%ld failed.\n", \ - ""#exp"", __FILE__, (long)__LINE__); } + ""#exp"", __FILE__, (long)__LINE__); \ + SetLastError(d_saved_lasterr); \ + } #define EASSERT_MSG(exp, msg) \ if (!(exp)) { \ + DWORD d_saved_lasterr = GetLastError(); \ eprintf("ASSERTION '%s' in '%s'/%ld failed, msg=", \ ""#exp"", __FILE__, (long)__LINE__); \ - eprintf_out msg ; } + eprintf_out msg ; \ + SetLastError(d_saved_lasterr); \ + } #define DASSERT(exp, level) \ - if (!(exp)) { \ - DPRINTF((level), ("ASSERTION '%s' in '%s'/%ld failed.\n", \ - ""#exp"", __FILE__, (long)__LINE__)); } + if (!(exp) && DPRINTF_LEVEL_ENABLED(level)) { \ + DWORD d_saved_lasterr = GetLastError(); \ + dprintf_out("ASSERTION '%s' in '%s'/%ld failed.\n", \ + ""#exp"", __FILE__, (long)__LINE__); \ + SetLastError(d_saved_lasterr); \ + } #define DASSERT_MSG(exp, level, msg) \ if (!(exp) && DPRINTF_LEVEL_ENABLED(level)) { \ - DPRINTF((level), ("ASSERTION '%s' in '%s'/%ld failed, msg=", \ - ""#exp"", __FILE__, (long)__LINE__)); \ - dprintf_out msg ; } + DWORD d_saved_lasterr = GetLastError(); \ + dprintf_out("ASSERTION '%s' in '%s'/%ld failed, msg=", \ + ""#exp"", __FILE__, (long)__LINE__); \ + dprintf_out msg ; \ + SetLastError(d_saved_lasterr); \ + } #define DASSERT_IS_VALID_NON_NULL_PTR(exp, level) \ - if (!DEBUG_IS_VALID_NON_NULL_PTR(exp)) { \ - DPRINTF((level), ("ASSERTION " \ + if (!DEBUG_IS_VALID_NON_NULL_PTR(exp) && \ + DPRINTF_LEVEL_ENABLED(level)) { \ + DWORD d_saved_lasterr = GetLastError(); \ + dprintf_out("ASSERTION " \ "!DEBUG_IS_VALID_NON_NULL_PTR('%s'=0x%p) " \ "in '%s'/%ld failed.\n", \ - ""#exp"", (void *)(exp), __FILE__, (long)__LINE__)); } + ""#exp"", (void *)(exp), __FILE__, (long)__LINE__); \ + SetLastError(d_saved_lasterr); \ + } #define EASSERT_IS_VALID_NON_NULL_PTR(exp) \ if (!DEBUG_IS_VALID_NON_NULL_PTR(exp)) { \ + DWORD d_saved_lasterr = GetLastError(); \ eprintf("ASSERTION " \ "!DEBUG_IS_VALID_NON_NULL_PTR('%s'=0x%p) " \ "in '%s'/%ld failed.\n", \ - ""#exp"", (void *)(exp), __FILE__, (long)__LINE__); } + ""#exp"", (void *)(exp), __FILE__, (long)__LINE__); \ + SetLastError(d_saved_lasterr); \ + } extern int g_debug_level; @@ -93,7 +112,9 @@ extern int g_debug_level; #define DPRINTF(level, args) \ { \ if (DPRINTF_LEVEL_ENABLED(level)) { \ + DWORD d_saved_lasterr = GetLastError(); \ dprintf_out args; \ + SetLastError(d_saved_lasterr); \ } \ } -- 2.45.1 From dd6beab985e0a6152d3e767870a6fc59e935e4a1 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Wed, 26 Jun 2024 15:43:30 +0200 Subject: [PATCH 4/4] cygwin,tests: Port "nfs_ea" utility to clang and add it to the default build Port "nfs_ea" utility to clang and add it to the default build. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- cygwin/Makefile | 1 + cygwin/Makefile.install | 5 ++++ tests/ea/Makefile | 24 +++++++++++++++++ tests/ea/main.c | 58 ++++++++++++++++++++++++----------------- 4 files changed, 64 insertions(+), 24 deletions(-) create mode 100644 tests/ea/Makefile diff --git a/cygwin/Makefile b/cygwin/Makefile index bcd07d5..a814d3f 100644 --- a/cygwin/Makefile +++ b/cygwin/Makefile @@ -54,6 +54,7 @@ build_32bit_debug: MSBuild.exe '$(shell cygpath -w "$(PROJECT_BASEDIR_DIR)/build.vc19/nfs41-client.sln")' -t:Build -p:Configuration=Debug -p:Platform=x86 build_testutils: + (cd "$(PROJECT_BASEDIR_DIR)/tests/ea" && make all) (cd "$(PROJECT_BASEDIR_DIR)/tests/winfsinfo1" && make all) (cd "$(PROJECT_BASEDIR_DIR)/tests/winsg" && make all) diff --git a/cygwin/Makefile.install b/cygwin/Makefile.install index 5aa2cc1..cf0f700 100644 --- a/cygwin/Makefile.install +++ b/cygwin/Makefile.install @@ -75,6 +75,11 @@ installdest: else \ cp "$(PROJECT_BASEDIR_DIR)/tests/winsg/winsg.i686.exe" $(DESTDIR)/$(CYGWIN_BASEPATH)/bin/winsg.exe ; \ fi + if [[ "$(CYGWIN_BASEPATH)" == *64* ]] ; then \ + cp "$(PROJECT_BASEDIR_DIR)/tests/ea/nfs_ea.x86_64.exe" $(DESTDIR)/$(CYGWIN_BASEPATH)/bin/nfs_ea.exe ; \ + else \ + cp "$(PROJECT_BASEDIR_DIR)/tests/ea/nfs_ea.i686.exe" $(DESTDIR)/$(CYGWIN_BASEPATH)/bin/nfs_ea.exe ; \ + fi @ printf "# Package ksh93&co (if available) since Cygwin does not ship with it yet\n" [[ -x $(CYGWIN_BASEPATH)/bin/ksh93.exe ]] && cp -f $(CYGWIN_BASEPATH)/bin/ksh93.exe $(DESTDIR)/$(CYGWIN_BASEPATH)/bin/ksh93.exe || true [[ -x $(CYGWIN_BASEPATH)/bin/shcomp.exe ]] && cp -f $(CYGWIN_BASEPATH)/bin/shcomp.exe $(DESTDIR)/$(CYGWIN_BASEPATH)/bin/shcomp.exe || true diff --git a/tests/ea/Makefile b/tests/ea/Makefile new file mode 100644 index 0000000..9f2bc98 --- /dev/null +++ b/tests/ea/Makefile @@ -0,0 +1,24 @@ +# +# Makefile for nfs_ea +# + +# POSIX Makefile + +all: nfs_ea.i686.exe nfs_ea.x86_64.exe nfs_ea.exe + +nfs_ea.i686.exe: main.c + clang -target i686-pc-windows-gnu -municode -Wall -DUNICODE=1 -D_UNICODE=1 -isystem /usr/include/w32api/ddk -g main.c -lntdll -o nfs_ea.i686.exe + +nfs_ea.x86_64.exe: main.c + clang -target x86_64-pc-windows-gnu -municode -Wall -DUNICODE=1 -D_UNICODE=1 -isystem /usr/include/w32api/ddk -g main.c -lntdll -o nfs_ea.x86_64.exe + +nfs_ea.exe: nfs_ea.x86_64.exe + rm -f nfs_ea.exe + ln -s nfs_ea.x86_64.exe nfs_ea.exe + +clean: + rm -fv \ + nfs_ea.i686.exe \ + nfs_ea.x86_64.exe \ + nfs_ea.exe \ +# EOF. diff --git a/tests/ea/main.c b/tests/ea/main.c index a123d78..03b72e6 100644 --- a/tests/ea/main.c +++ b/tests/ea/main.c @@ -3,6 +3,7 @@ * * Olga Kornievskaia <aglo@umich.edu> * Casey Bodley <cbodley@umich.edu> + * Roland Mainz <roland.mainz@nrubsig.org> * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by @@ -23,6 +24,9 @@ #include <strsafe.h> #include <stdio.h> +#if 1 +typedef unsigned long DWORD, *PDWORD, *LPDWORD; +#endif #define MAX_LIST_LEN 4096 #define MAX_EA_VALUE 256 @@ -33,12 +37,14 @@ static NTSTATUS ea_list( HANDLE FileHandle) { - IO_STATUS_BLOCK IoStatusBlock = { 0 }; + IO_STATUS_BLOCK IoStatusBlock; CHAR Buffer[MAX_LIST_LEN]; PFILE_FULL_EA_INFORMATION EaBuffer; NTSTATUS status; BOOLEAN RestartScan = TRUE; + (void)memset(&IoStatusBlock, 0, sizeof(IoStatusBlock)); + on_overflow: EaBuffer = (PFILE_FULL_EA_INFORMATION)Buffer; @@ -49,10 +55,10 @@ on_overflow: case STATUS_BUFFER_OVERFLOW: break; case STATUS_NO_EAS_ON_FILE: - printf("No EAs on file.\n", status); + printf("No EAs on file, status=0x%lx.\n", (long)status); goto out; default: - fprintf(stderr, "ZwQueryEaFile() failed with %X\n", status); + fprintf(stderr, "ZwQueryEaFile() failed with 0x%lx\n", (long)status); goto out; } @@ -67,7 +73,7 @@ on_overflow: } if (status == STATUS_BUFFER_OVERFLOW) { - printf("overflow, querying more\n", status); + printf("overflow, querying more, status=0x%lx\n", (long)status); RestartScan = FALSE; goto on_overflow; } @@ -80,7 +86,7 @@ static NTSTATUS ea_get( IN LPCWSTR EaNames[], IN DWORD Count) { - IO_STATUS_BLOCK IoStatusBlock = { 0 }; + IO_STATUS_BLOCK IoStatusBlock; CHAR GetBuffer[MAX_LIST_LEN] = { 0 }; CHAR FullBuffer[MAX_LIST_LEN] = { 0 }; PFILE_GET_EA_INFORMATION EaList = (PFILE_GET_EA_INFORMATION)GetBuffer, EaQuery; @@ -89,6 +95,8 @@ static NTSTATUS ea_get( DWORD i; NTSTATUS status; + (void)memset(&IoStatusBlock, 0, sizeof(IoStatusBlock)); + EaQuery = EaList; EaListLength = 0; @@ -100,7 +108,7 @@ static NTSTATUS ea_get( status = RtlUnicodeToUTF8N(EaQuery->EaName, MAX_EA_VALUE, &ActualByteCount, EaName, EaNameLength); if (status) { - fwprintf(stderr, L"RtlUnicodeToUTF8N('%s') failed with %X\n", EaName, status); + fwprintf(stderr, L"RtlUnicodeToUTF8N('%s') failed with 0x%lx\n", EaName, (long)status); goto out; } EaQuery->EaNameLength = (UCHAR)ActualByteCount - 1; @@ -115,20 +123,20 @@ static NTSTATUS ea_get( } EaQuery = (PFILE_GET_EA_INFORMATION)((PCHAR)EaQuery + EaQuery->NextEntryOffset); } - + status = ZwQueryEaFile(FileHandle, &IoStatusBlock, EaBuffer, MAX_FULLEA, FALSE, EaList, EaListLength, NULL, TRUE); switch (status) { case STATUS_SUCCESS: break; case STATUS_NO_EAS_ON_FILE: - printf("No EAs on file.\n", status); + printf("No EAs on file, status=0x%lx.\n", (long)status); goto out; default: - fprintf(stderr, "ZwQueryEaFile('%s') failed with %X\n", EaList->EaName, status); + fprintf(stderr, "ZwQueryEaFile('%s') failed with 0x%lx\n", EaList->EaName, (long)status); goto out; } - + while (EaBuffer) { printf("%s = %.*s\n", EaBuffer->EaName, EaBuffer->EaValueLength, EaBuffer->EaName + EaBuffer->EaNameLength + 1); @@ -161,7 +169,7 @@ static NTSTATUS full_ea_init( FIELD_OFFSET(FILE_FULL_EA_INFORMATION, EaName), &ActualByteCount, EaName, EaNameLength); if (status) { - fwprintf(stderr, L"RtlUnicodeToUTF8N('%s') failed with %X\n", EaName, status); + fwprintf(stderr, L"RtlUnicodeToUTF8N('%s') failed with 0x%lx\n", EaName, (long)status); goto out; } EaBuffer->EaNameLength = (UCHAR)ActualByteCount - 1; @@ -176,7 +184,7 @@ static NTSTATUS full_ea_init( MAX_FULLEA - FIELD_OFFSET(FILE_FULL_EA_INFORMATION, EaName) - EaBuffer->EaNameLength - 1, &ActualByteCount, EaValue, EaValueLength); if (status) { - fwprintf(stderr, L"RtlUnicodeToUTF8N('%s') failed with %X\n", EaName, status); + fwprintf(stderr, L"RtlUnicodeToUTF8N('%s') failed with 0x%lx\n", EaName, (long)status); goto out; } EaBuffer->EaValueLength = (UCHAR)ActualByteCount - 1; @@ -193,9 +201,11 @@ static NTSTATUS ea_set( IN PFILE_FULL_EA_INFORMATION EaBuffer, IN ULONG EaLength) { - IO_STATUS_BLOCK IoStatusBlock = { 0 }; + IO_STATUS_BLOCK IoStatusBlock; NTSTATUS status; + (void)memset(&IoStatusBlock, 0, sizeof(IoStatusBlock)); + status = ZwSetEaFile(FileHandle, &IoStatusBlock, EaBuffer, EaLength); switch (status) { case STATUS_SUCCESS: @@ -203,13 +213,13 @@ static NTSTATUS ea_set( EaBuffer->EaName + EaBuffer->EaNameLength + 1); break; default: - fprintf(stderr, "ZwSetEaFile() failed with %X\n", status); + fprintf(stderr, "ZwSetEaFile() failed with 0x%lx\n", (long)status); break; } return status; } -int wmain(DWORD argc, LPWSTR argv[]) +int wmain(int argc, const wchar_t *argv[]) { UNICODE_STRING FileName; OBJECT_ATTRIBUTES ObjectAttributes; @@ -228,13 +238,13 @@ int wmain(DWORD argc, LPWSTR argv[]) ULONG EaLength = 0; if (argc < 3) { - fwprintf(stderr, L"Usage: nfs_ea <filename> <create|set|get|list> ...\n"); + fwprintf(stderr, L"Usage: nfs_ea <ntobjectpath> <create|set|get|list> ...\n"); status = STATUS_INVALID_PARAMETER; goto out; } if (wcscmp(argv[2], L"create") == 0) { if (argc < 5) { - fwprintf(stderr, L"Usage: nfs_ea <filename> create <name> <value>\n"); + fwprintf(stderr, L"Usage: nfs_ea <ntobjectpath> create <name> <value>\n"); status = STATUS_INVALID_PARAMETER; goto out; } @@ -246,19 +256,19 @@ int wmain(DWORD argc, LPWSTR argv[]) wprintf(L"Creating file %s.\n", argv[1]); } else if (wcscmp(argv[2], L"set") == 0) { if (argc < 4) { - fwprintf(stderr, L"Usage: nfs_ea <filename> set <name> [value]\n"); + fwprintf(stderr, L"Usage: nfs_ea <ntobjectpath> set <name> [value]\n"); status = STATUS_INVALID_PARAMETER; goto out; } DesiredAccess |= GENERIC_WRITE; } else if (wcscmp(argv[2], L"get") == 0) { if (argc < 4) { - fwprintf(stderr, L"Usage: nfs_ea <filename> get <name> [name...]\n"); + fwprintf(stderr, L"Usage: nfs_ea <ntobjectpath> get <name> [name...]\n"); status = STATUS_INVALID_PARAMETER; goto out; } } else if (wcscmp(argv[2], L"list") != 0) { - fwprintf(stderr, L"Usage: nfs_ea <filename> <create|set|get|list> ...\n"); + fwprintf(stderr, L"Usage: nfs_ea <ntobjectpath> <create|set|get|list> ...\n"); status = STATUS_INVALID_PARAMETER; goto out; } @@ -270,7 +280,7 @@ int wmain(DWORD argc, LPWSTR argv[]) &IoStatusBlock, NULL, FileAttributes, ShareAccess, CreateDisposition, CreateOptions, EaBuffer, EaLength); if (status) { - fwprintf(stderr, L"NtCreateFile(%s) failed with %X\n", FileName.Buffer, status); + fwprintf(stderr, L"NtCreateFile(%s) failed with 0x%lx\n", FileName.Buffer, (long)status); goto out; } @@ -281,15 +291,15 @@ int wmain(DWORD argc, LPWSTR argv[]) if (status) goto out_close; - wprintf(L"Setting extended attribute '%s' on file %s:\n", + wprintf(L"Setting extended attribute '%s' on file '%s':\n", argv[3], FileName.Buffer); status = ea_set(FileHandle, EaBuffer, EaLength); } else if (wcscmp(argv[2], L"get") == 0) { - wprintf(L"Querying extended attribute on file %s:\n", + wprintf(L"Querying extended attribute on file '%s':\n", argv[3], FileName.Buffer); status = ea_get(FileHandle, argv + 3, argc - 3); } else if (wcscmp(argv[2], L"list") == 0) { - wprintf(L"Listing extended attributes for %s:\n", FileName.Buffer); + wprintf(L"Listing extended attributes for '%s':\n", FileName.Buffer); status = ea_list(FileHandle); } else if (wcscmp(argv[2], L"create") == 0) { wprintf(L"File '%s' was created with \n", FileName.Buffer); -- 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