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 disk-/quota-full errors, nfs_umount.exe, cygwinaccount2nfs4account.ksh+misc, 2024-07-25
Posted by Anonymous on Thu 25th Jul 2024 20: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 32277a7309e810583156e9cee8a03982b9c70571 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Thu, 25 Jul 2024 18:19:48 +0200 Subject: [PATCH 1/6] cygwin,daemon,sys: Handle NFSv4 "disk full" (full, quota, file to large) errors Handle NFSv4 "disk full" (full, quota, file to large for filesystem etc) errors. Also document that memory-mapped files can cause Windows event log entries ("MUP 0xc0000222" - |STATUS_LOST_WRITEBEHIND_DATA|) if a writeback from a memory-mapped fails. Reported-by: Martin Wege <martin.l.wege@gmail.com> Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- cygwin/README.bintarball.txt | 11 +++++++++++ daemon/util.c | 1 + sys/nfs41_driver.c | 17 +++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/cygwin/README.bintarball.txt b/cygwin/README.bintarball.txt index 8cca4cc..8236bb6 100644 --- a/cygwin/README.bintarball.txt +++ b/cygwin/README.bintarball.txt @@ -431,6 +431,17 @@ $ /sbin/nfs_mount option, e.g. $ /sbin/nfs_mount -o rw,writethru 'j' derfwpc5131:/export/home/rmainz # +- Windows event log can list errors like "MUP 0xc0000222" + (|STATUS_LOST_WRITEBEHIND_DATA|) in case the disk on the NFSv4 server + is full and outstanding writes from a memory-mapped file fail. + Example: + ---- snip ---- + {Fehler beim verzoegerten Schreibvorgang} Nicht alle Daten fuer die + Datei "\\34.159.25.153@2049\nfs4\export\nfs4export\gcc\lto-dump.exe" + konnten gespeichert werden. Daten gingen verloren. + Dieser Fehler wurde von dem Server zurueckgegeben, auf dem sich die + Datei befindet. Versuchen Sie, die Datei woanders zu speichern. + ---- snip ---- # # 11. Notes for troubleshooting && finding bugs/debugging: diff --git a/daemon/util.c b/daemon/util.c index 44bac60..4a7d9a9 100644 --- a/daemon/util.c +++ b/daemon/util.c @@ -339,6 +339,7 @@ int nfs_to_windows_error(int status, int default_error) case NFS4ERR_INVAL: return ERROR_INVALID_PARAMETER; case NFS4ERR_FBIG: return ERROR_FILE_TOO_LARGE; case NFS4ERR_NOSPC: return ERROR_DISK_FULL; + case NFS4ERR_DQUOT: return ERROR_DISK_QUOTA_EXCEEDED; case NFS4ERR_ROFS: return ERROR_NETWORK_ACCESS_DENIED; case NFS4ERR_MLINK: return ERROR_TOO_MANY_LINKS; case NFS4ERR_NAMETOOLONG: return ERROR_FILENAME_EXCED_RANGE; diff --git a/sys/nfs41_driver.c b/sys/nfs41_driver.c index cc4c741..f1c2ee8 100644 --- a/sys/nfs41_driver.c +++ b/sys/nfs41_driver.c @@ -3963,6 +3963,9 @@ NTSTATUS map_open_errors( case ERROR_TOO_MANY_LINKS: return STATUS_TOO_MANY_LINKS; case ERROR_DIRECTORY: return STATUS_FILE_IS_A_DIRECTORY; case ERROR_BAD_FILE_TYPE: return STATUS_NOT_A_DIRECTORY; + case ERROR_DISK_FULL: return STATUS_DISK_FULL; + case ERROR_DISK_QUOTA_EXCEEDED: return STATUS_DISK_QUOTA_EXCEEDED; + case ERROR_FILE_TOO_LARGE: return STATUS_FILE_TOO_LARGE; case ERROR_INTERNAL_ERROR: return STATUS_INTERNAL_ERROR; default: print_error("[ERROR] nfs41_Create: upcall returned ERROR_0x%x " @@ -4587,6 +4590,9 @@ NTSTATUS map_close_errors( case ERROR_NETNAME_DELETED: return STATUS_NETWORK_NAME_DELETED; case ERROR_NOT_EMPTY: return STATUS_DIRECTORY_NOT_EMPTY; case ERROR_FILE_INVALID: return STATUS_FILE_INVALID; + case ERROR_DISK_FULL: return STATUS_DISK_FULL; + case ERROR_DISK_QUOTA_EXCEEDED: return STATUS_DISK_QUOTA_EXCEEDED; + case ERROR_FILE_TOO_LARGE: return STATUS_FILE_TOO_LARGE; default: print_error("map_close_errors: " "failed to map windows ERROR_0x%x to NTSTATUS; " @@ -5155,6 +5161,8 @@ NTSTATUS map_setea_error( case ERROR_INVALID_EA_HANDLE: return STATUS_NONEXISTENT_EA_ENTRY; case ERROR_NO_MORE_FILES: return STATUS_NO_MORE_EAS; case ERROR_EA_FILE_CORRUPT: return STATUS_EA_CORRUPT_ERROR; + case ERROR_DISK_FULL: return STATUS_DISK_FULL; + case ERROR_DISK_QUOTA_EXCEEDED: return STATUS_DISK_QUOTA_EXCEEDED; case ERROR_INTERNAL_ERROR: return STATUS_INTERNAL_ERROR; default: print_error("map_setea_error: " @@ -6031,6 +6039,9 @@ NTSTATUS map_setfile_error( case ERROR_NETWORK_ACCESS_DENIED: return STATUS_NETWORK_ACCESS_DENIED; case ERROR_NETNAME_DELETED: return STATUS_NETWORK_NAME_DELETED; case ERROR_BUFFER_OVERFLOW: return STATUS_INSUFFICIENT_RESOURCES; + case ERROR_DISK_FULL: return STATUS_DISK_FULL; + case ERROR_DISK_QUOTA_EXCEEDED: return STATUS_DISK_QUOTA_EXCEEDED; + case ERROR_FILE_TOO_LARGE: return STATUS_FILE_TOO_LARGE; case ERROR_INTERNAL_ERROR: return STATUS_INTERNAL_ERROR; default: print_error("map_setfile_error: " @@ -6438,6 +6449,9 @@ NTSTATUS map_readwrite_errors( case ERROR_LOCK_VIOLATION: return STATUS_FILE_LOCK_CONFLICT; case ERROR_NETWORK_ACCESS_DENIED: return STATUS_NETWORK_ACCESS_DENIED; case ERROR_NETNAME_DELETED: return STATUS_NETWORK_NAME_DELETED; + case ERROR_DISK_FULL: return STATUS_DISK_FULL; + case ERROR_DISK_QUOTA_EXCEEDED: return STATUS_DISK_QUOTA_EXCEEDED; + case ERROR_FILE_TOO_LARGE: return STATUS_FILE_TOO_LARGE; case ERROR_INTERNAL_ERROR: return STATUS_INTERNAL_ERROR; default: print_error("map_readwrite_errors: " @@ -6939,6 +6953,9 @@ NTSTATUS map_symlink_errors( case ERROR_INSUFFICIENT_BUFFER: return STATUS_BUFFER_TOO_SMALL; case STATUS_BUFFER_TOO_SMALL: case ERROR_BUFFER_OVERFLOW: return STATUS_BUFFER_OVERFLOW; + case ERROR_DISK_FULL: return STATUS_DISK_FULL; + case ERROR_DISK_QUOTA_EXCEEDED: return STATUS_DISK_QUOTA_EXCEEDED; + case ERROR_FILE_TOO_LARGE: return STATUS_FILE_TOO_LARGE; case ERROR_INTERNAL_ERROR: return STATUS_INTERNAL_ERROR; default: print_error("map_symlink_errors: " -- 2.45.1 From dd4f99c7a7089cf15736e56d485e23d3e6b6e7b1 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Thu, 25 Jul 2024 18:30:47 +0200 Subject: [PATCH 2/6] cygwin,mount: Provide nfs_umount to unmount NFSv4.1 filesystems Provide nfs_umount.exe to unmount NFSv4.1 filesystems, for feature-parity with Microsofts NFSv3 umount.exe command. Reported-by: Josh Hurst <joshhurst@gmail.com> Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- cygwin/Makefile.install | 2 + cygwin/README.bintarball.txt | 4 +- mount/mount.c | 155 ++++++++++++++++++++++++++++++----- 3 files changed, 137 insertions(+), 24 deletions(-) diff --git a/cygwin/Makefile.install b/cygwin/Makefile.install index cf0f700..774da61 100644 --- a/cygwin/Makefile.install +++ b/cygwin/Makefile.install @@ -36,6 +36,8 @@ installdest: cp -r $(VS_BUILD_DIR)/nfsd.exe $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfsd_debug.exe cp -r $(VS_BUILD_DIR)/nfsd.pdb $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfsd_debug.pdb cp -r $(VS_BUILD_DIR)/nfs_mount.* $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. + # we need a hardlink for nfs_umount.exe, softlinks do not work + ln -f $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_mount.exe $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_umount.exe cp -r $(VS_BUILD_DIR)/nfsd.* $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. cp -r $(VS_BUILD_DIR)/nfs_install.* $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. cp -r $(VS_BUILD_DIR)/libtirpc.* $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. diff --git a/cygwin/README.bintarball.txt b/cygwin/README.bintarball.txt index 8236bb6..ddb43f7 100644 --- a/cygwin/README.bintarball.txt +++ b/cygwin/README.bintarball.txt @@ -249,7 +249,7 @@ drwxr-xr-x 3 Unix_User+197608 Unix_Group+197121 60 Dec 13 17:58 directory_t drwxr-xr-x 3 Unix_User+197608 Unix_Group+197121 60 Dec 7 11:01 test2 # Unmount filesystem: -$ cd ~ && /sbin/nfs_mount -d N: +$ cd ~ && /sbin/nfs_umount N: # OR $ cd ~ $ net use N: /delete @@ -399,7 +399,7 @@ $ /sbin/nfs_mount FileBothDirInformation, FileFullDirInfo, or FileIdFullDirInfo. - Win10/32bit-only: $ net use H: /delete # does not work, - use $ nfs_mount -d 'H' instead # + use $ nfs_umount 'H' instead # - Bug: Subversion checkout can fail with "sqlite[S11]: database disk image is malformed" like this: diff --git a/mount/mount.c b/mount/mount.c index 9758e1c..2799980 100644 --- a/mount/mount.c +++ b/mount/mount.c @@ -73,10 +73,13 @@ static BOOL ParseDriveLetter( void PrintErrorMessage( IN DWORD dwError); -static VOID PrintUsage(LPWSTR pProcess) +static +void PrintMountUsage(LPWSTR pProcess) { (void)fprintf(stderr, "Usage: %S [options] <drive letter|*> <hostname>:<path>\n" + "Usage: %S -d [options] <drive letter>\n" + "Usage: %S\n" "* Options:\n" "\t-h, --help, /?\thelp\n" @@ -138,10 +141,26 @@ static VOID PrintUsage(LPWSTR pProcess) "\tnfs_mount.exe -o sec=sys,rw S nfs://myhost1//dirwithspace/dir%%20space/test2\n" "\tnfs_mount.exe -o sec=sys,rw S nfs://myhost1//dirwithspace/dir+space/test2\n" "\tnfs_mount.exe -o sec=sys S nfs://myhost1//dirwithspace/dir+space/test2?rw=1\n", - pProcess, (int)NFS41_DRIVER_DEFAULT_CREATE_MODE); + pProcess, pProcess, pProcess, + (int)NFS41_DRIVER_DEFAULT_CREATE_MODE); } -int __cdecl wmain(int argc, wchar_t *argv[]) + +static +void PrintUmountUsage(LPWSTR pProcess) +{ + (void)fprintf(stderr, + "Usage: %S [options] <drive letter>\n" + + "* Options:\n" + "\t-h, --help, /?\thelp\n" + "\t-f, --force\tforce unmount if the drive is in use\n", + pProcess); +} + + +static +int mount_main(int argc, wchar_t *argv[]) { int i; DWORD result = NO_ERROR; @@ -157,16 +176,6 @@ int __cdecl wmain(int argc, wchar_t *argv[]) wchar_t *mntopts[MAX_MNTOPTS] = { 0 }; int num_mntopts = 0; - int crtsetdbgflags = 0; - crtsetdbgflags |= _CRTDBG_ALLOC_MEM_DF; /* use debug heap */ - crtsetdbgflags |= _CRTDBG_LEAK_CHECK_DF; /* report leaks on exit */ - crtsetdbgflags |= _CRTDBG_DELAY_FREE_MEM_DF; - (void)_CrtSetDbgFlag(crtsetdbgflags); - (void)_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE); - (void)_CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE); - (void)_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE); - - if (argc == 1) { /* list open nfs shares */ result = EnumMounts(NULL); @@ -191,7 +200,7 @@ int __cdecl wmain(int argc, wchar_t *argv[]) /* help */ if ((!wcscmp(argv[i], L"-h")) || (!wcscmp(argv[i], L"--help"))) { - PrintUsage(argv[0]); + PrintMountUsage(argv[0]); goto out; } /* unmount */ @@ -218,7 +227,7 @@ int __cdecl wmain(int argc, wchar_t *argv[]) result = ERROR_BAD_ARGUMENTS; (void)fwprintf(stderr, L"Mount options missing after '-o'.\n\n"); - PrintUsage(argv[0]); + PrintMountUsage(argv[0]); goto out_free; } @@ -335,15 +344,15 @@ opt_o_argv_i_again: result = ERROR_BAD_ARGUMENTS; (void)fwprintf(stderr, L"Filesystem type missing " L"after '-t'/'-F'.\n\n"); - PrintUsage(argv[0]); + PrintMountUsage(argv[0]); goto out_free; } if (!wcscmp(argv[i], L"nfs")) { result = ERROR_BAD_ARGUMENTS; (void)fwprintf(stderr, L"Filesystem type '%s' " - L"not supported.\n\n", argv[i]); - PrintUsage(argv[0]); + L"not supported.\n\n./build.vc19/x64/Debug/nfs_mount.exe", argv[i]); + PrintMountUsage(argv[0]); goto out_free; } } @@ -354,7 +363,7 @@ opt_o_argv_i_again: } /* Windows-style "nfs_mount /?" help */ else if (!wcscmp(argv[i], L"/?")) { - PrintUsage(argv[0]); + PrintMountUsage(argv[0]); goto out; } /* drive letter */ @@ -377,7 +386,7 @@ opt_o_argv_i_again: { result = ERROR_BAD_ARGUMENTS; (void)fwprintf(stderr, L"Missing argument for drive letter.\n\n"); - PrintUsage(argv[0]); + PrintMountUsage(argv[0]); goto out_free; } if (FALSE == ParseDriveLetter(pLocalName, szLocalName)) @@ -386,7 +395,7 @@ opt_o_argv_i_again: (void)fwprintf(stderr, L"Invalid drive letter '%s'. " L"Expected 'C' or 'C:'.\n\n", pLocalName); - PrintUsage(argv[0]); + PrintMountUsage(argv[0]); goto out_free; } @@ -407,7 +416,7 @@ opt_o_argv_i_again: { result = ERROR_BAD_NET_NAME; (void)fwprintf(stderr, L"Missing argument for remote path.\n\n"); - PrintUsage(argv[0]); + PrintMountUsage(argv[0]); goto out_free; } @@ -446,6 +455,108 @@ out: return result; } + +static +int umount_main(int argc, wchar_t *argv[]) +{ + int i; + DWORD result = NO_ERROR; + LPWSTR pLocalName = NULL; + wchar_t szLocalName[] = L"C:\0"; + BOOL bForceUnmount = FALSE; + + /* parse command line */ + for (i = 1; i < argc; i++) { + if (argv[i][0] == L'-') { + /* help */ + if ((!wcscmp(argv[i], L"-h")) || + (!wcscmp(argv[i], L"--help"))) { + PrintUmountUsage(argv[0]); + goto out; + } + /* force unmount */ + else if ((!wcscmp(argv[i], L"-f")) || + (!wcscmp(argv[i], L"--force"))) { + bForceUnmount = TRUE; + } + else { + (void)fwprintf(stderr, L"Unrecognized option " + L"'%s', disregarding.\n", + argv[i]); + result = ERROR_BAD_ARGUMENTS; + } + } + /* Windows-style "nfs_umount /?" help */ + else if (!wcscmp(argv[i], L"/?")) { + PrintUmountUsage(argv[0]); + goto out; + } + /* drive letter */ + else if (pLocalName == NULL) { + pLocalName = argv[i]; + } + else { + (void)fwprintf(stderr, L"Unrecognized argument " + L"'%s', disregarding.\n", + argv[i]); + } + } + + if (pLocalName == NULL) { + result = ERROR_BAD_ARGUMENTS; + (void)fwprintf(stderr, L"Drive letter expected.\n"); + PrintUmountUsage(argv[0]); + goto out; + } + + if (!ParseDriveLetter(pLocalName, szLocalName)) { + result = ERROR_BAD_ARGUMENTS; + (void)fwprintf(stderr, L"Invalid drive letter '%s'. " + L"Expected 'C' or 'C:'.\n\n", + pLocalName); + PrintUmountUsage(argv[0]); + goto out; + } + + result = DoUnmount(szLocalName, bForceUnmount); + if (result) + PrintErrorMessage(result); +out: + return result; +} + + +int __cdecl wmain(int argc, wchar_t *argv[]) +{ + DWORD result = NO_ERROR; + + int crtsetdbgflags = 0; + crtsetdbgflags |= _CRTDBG_ALLOC_MEM_DF; /* use debug heap */ + crtsetdbgflags |= _CRTDBG_LEAK_CHECK_DF; /* report leaks on exit */ + crtsetdbgflags |= _CRTDBG_DELAY_FREE_MEM_DF; + (void)_CrtSetDbgFlag(crtsetdbgflags); + (void)_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE); + (void)_CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE); + (void)_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE); + + if (wcsstr(argv[0], L"nfs_mount")) { + result = mount_main(argc, argv); + goto out; + } + else if (wcsstr(argv[0], L"nfs_umount")) { + result = umount_main(argc, argv); + goto out; + } + else { + (void)fwprintf(stderr, L"%s: Unknown mode\n", argv[0]); + result = 1; + goto out; + } +out: + return result; +} + + static void ConvertUnixSlashes( IN OUT LPWSTR pRemoteName) { -- 2.45.1 From c12fe659a0dca9e72fe4178b24260df91d04e03a Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Thu, 25 Jul 2024 18:40:41 +0200 Subject: [PATCH 3/6] sys: |map_symlink_errors()| should handle |ERROR_TOO_MANY_LINKS| |map_symlink_errors()| should map |ERROR_TOO_MANY_LINKS| to |STATUS_TOO_MANY_LINKS|. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- sys/nfs41_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/nfs41_driver.c b/sys/nfs41_driver.c index f1c2ee8..0cf7316 100644 --- a/sys/nfs41_driver.c +++ b/sys/nfs41_driver.c @@ -6956,6 +6956,7 @@ NTSTATUS map_symlink_errors( case ERROR_DISK_FULL: return STATUS_DISK_FULL; case ERROR_DISK_QUOTA_EXCEEDED: return STATUS_DISK_QUOTA_EXCEEDED; case ERROR_FILE_TOO_LARGE: return STATUS_FILE_TOO_LARGE; + case ERROR_TOO_MANY_LINKS: return STATUS_TOO_MANY_LINKS; case ERROR_INTERNAL_ERROR: return STATUS_INTERNAL_ERROR; default: print_error("map_symlink_errors: " -- 2.45.1 From b32b1baa038885039cac38e58762044ea6d54750 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Thu, 25 Jul 2024 19:14:57 +0200 Subject: [PATCH 4/6] mount: nfs_mount.exe exit codes should be useable Fix nfs_mount.exe exit codes. POSIX process return values can only in the range from |0|...|SCHAR_MAX|, so returning Windows |ERROR_*| values does not work. Instead we now return { 0, 1 }, and maybe more values (up to |SCHAR_MAX-1|) in the future Reported-by: Josh Hurst <joshhurst@gmail.com> Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- mount/mount.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/mount/mount.c b/mount/mount.c index 2799980..6d7435c 100644 --- a/mount/mount.c +++ b/mount/mount.c @@ -201,6 +201,7 @@ int mount_main(int argc, wchar_t *argv[]) if ((!wcscmp(argv[i], L"-h")) || (!wcscmp(argv[i], L"--help"))) { PrintMountUsage(argv[0]); + result = 1; goto out; } /* unmount */ @@ -364,6 +365,7 @@ opt_o_argv_i_again: /* Windows-style "nfs_mount /?" help */ else if (!wcscmp(argv[i], L"/?")) { PrintMountUsage(argv[0]); + result = 1; goto out; } /* drive letter */ @@ -472,6 +474,7 @@ int umount_main(int argc, wchar_t *argv[]) if ((!wcscmp(argv[i], L"-h")) || (!wcscmp(argv[i], L"--help"))) { PrintUmountUsage(argv[0]); + result = 1; goto out; } /* force unmount */ @@ -489,6 +492,7 @@ int umount_main(int argc, wchar_t *argv[]) /* Windows-style "nfs_umount /?" help */ else if (!wcscmp(argv[i], L"/?")) { PrintUmountUsage(argv[0]); + result = 1; goto out; } /* drive letter */ @@ -552,8 +556,13 @@ int __cdecl wmain(int argc, wchar_t *argv[]) result = 1; goto out; } + out: - return result; + /* + * POSIX return value of a command can only in the range from + * |0|...|SCHAR_MAX|, so map the |ERROR_*| to |1|,|0|. + */ + return (result != NO_ERROR)?1:0; } -- 2.45.1 From c67e95bf7336a7c25e7d02988d05196228c420fa Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Thu, 25 Jul 2024 20:33:40 +0200 Subject: [PATCH 5/6] cygwin: Add utility to convert Win32 account+group info into NFSv4 server account data Add new /sbin/cygwinaccount2nfs4account utility to convert Win32 account+group info into UNIX/Linux NFSv4 server account data Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- cygwin/Makefile.install | 4 + cygwin/README.bintarball.txt | 6 + .../cygwinaccount2nfs4account.ksh | 235 ++++++++++++++++++ 3 files changed, 245 insertions(+) create mode 100644 cygwin/utils/cygwinaccount2nfs4account/cygwinaccount2nfs4account.ksh diff --git a/cygwin/Makefile.install b/cygwin/Makefile.install index 774da61..68f2b63 100644 --- a/cygwin/Makefile.install +++ b/cygwin/Makefile.install @@ -55,6 +55,10 @@ installdest: git diff -w >"$(DESTDIR)/$(CYGWIN_BASEPATH)/usr/src/msnfs41client/msnfs41client_diff_w.diff" git diff >"$(DESTDIR)/$(CYGWIN_BASEPATH)/usr/src/msnfs41client/msnfs41client_diff.diff" @ printf "# Package utilties\n" + cp $(CYGWIN_MAKEFILE_DIR)/utils/cygwinaccount2nfs4account/cygwinaccount2nfs4account.ksh $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/cygwinaccount2nfs4account + chmod a+x $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/cygwinaccount2nfs4account + PATH+=":$(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/" \ + /usr/bin/ksh93 $(CYGWIN_MAKEFILE_DIR)/utils/cygwinaccount2nfs4account/cygwinaccount2nfs4account.ksh --nroff 2>"$(DESTDIR)/$(CYGWIN_BASEPATH)/usr/share/man/man1/cygwinaccount2nfs4account.1" || true cp $(CYGWIN_MAKEFILE_DIR)/utils/mount_sshnfs/mount_sshnfs.ksh $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/mount_sshnfs chmod a+x $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/mount_sshnfs PATH+=":$(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/" \ diff --git a/cygwin/README.bintarball.txt b/cygwin/README.bintarball.txt index ddb43f7..dcbbf65 100644 --- a/cygwin/README.bintarball.txt +++ b/cygwin/README.bintarball.txt @@ -350,6 +350,12 @@ $ /sbin/nfs_mount Solaris/Illumos using export option "resvport" (see nfs(5)), as the NFSv4 client source TCP port will be >= 1024. +- Install: Adding Windows accounts+groups to the NFSv4 server: + ms-nfs41-client comes with /sbin/cygwinaccount2nfs4account to + convert the Win32/Cygwin account information of the (current) + user+groups to a small script for the NFSv4 server to set-up + these accounts on the server side. + # # 10. Known issues: # diff --git a/cygwin/utils/cygwinaccount2nfs4account/cygwinaccount2nfs4account.ksh b/cygwin/utils/cygwinaccount2nfs4account/cygwinaccount2nfs4account.ksh new file mode 100644 index 0000000..5979eb9 --- /dev/null +++ b/cygwin/utils/cygwinaccount2nfs4account/cygwinaccount2nfs4account.ksh @@ -0,0 +1,235 @@ +#!/bin/ksh93 + +# +# MIT License +# +# Copyright (c) 2024 Roland Mainz <roland.mainz@nrubsig.org> +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# + +# +# cygwinaccount2nfs4account.ksh93 - transfer Cygwin user/group account +# info to Linux/UNIX NFSv4 server account data +# + +# +# Written by Roland Mainz <roland.mainz@nrubsig.org> +# + +function getent_passwd2compound +{ + set -o nounset + + typeset username="$2" + typeset leftover + nameref data="$1" # output compound variable + + compound out + + # capture getent output + out.stderr="${ { out.stdout="${ getent passwd "$username" ; (( out.res=$? )) ; }" ; } 2>&1 ; }" + + if [[ "${out.stderr}" != '' ]] || (( out.res != 0 )) ; then + print -u2 $"%s: getent failed, msg=%q, res=%d\n" \ + "$0" "${out.stderr}" out.res + return 1 + fi + + # ~(E) is POSIX extended regular expression matching (instead + # of shell pattern), "x" means "multiline", "l" means "left + # anchor", "r" means "right anchor" + leftover="${out.stdout/~(Elrx) + (.+?) # login name + :(.+?) # encrypted passwd + :(.+?) # uid + :(.+?) # gid + :(.+?) # comment + :(.+?) # homedir + (?::(.+?))? # shell (optional) + /X}" + + # All parsed data should be captured via eregex in .sh.match - if + # there is anything left (except the 'X') then the input string did + # not properly match the eregex + [[ "$leftover" == 'X' ]] || + { print -u2 -f $"%s: Parser error, leftover=%q\n" \ + "$0" "$leftover" ; return 1 ; } + + data.getent_username="$username" + data.login_name="${.sh.match[1]}" + data.encrypted_passwd="${.sh.match[2]}" + data.uid="${.sh.match[3]}" + data.gid="${.sh.match[4]}" + data.comment="${.sh.match[5]}" + data.homedir="${.sh.match[6]}" + data.shell="${.sh.match[7]}" + + return 0 +} + +function getent_group2compound +{ + set -o nounset + + typeset groupname="$2" + typeset leftover + nameref data="$1" # output compound variable + + compound out + + # capture getent output + out.stderr="${ { out.stdout="${ getent group "$groupname" ; (( out.res=$? )) ; }" ; } 2>&1 ; }" + + if [[ "${out.stderr}" != '' ]] || (( out.res != 0 )) ; then + print -u2 $"%s: getent failed, msg=%q, res=%d\n" \ + "$0" "${out.stderr}" out.res + return 1 + fi + + # ~(E) is POSIX extended regular expression matching (instead + # of shell pattern), "x" means "multiline", "l" means "left + # anchor", "r" means "right anchor" + leftover="${out.stdout/~(Elrx) + (.+?): # group + (.+?): # encrypted passwd + (.+?): # gid + (?:(.+?))? # userlist + /X}" + + # All parsed data should be captured via eregex in .sh.match - if + # there is anything left (except the 'X') then the input string did + # not properly match the eregex + [[ "$leftover" == 'X' ]] || + { print -u2 -f $"%s: Parser error, leftover=%q\n" \ + "$0" "$leftover" ; return 1 ; } + + data.getent_groupname="$groupname" + data.group_name="${.sh.match[1]}" + data.encrypted_passwd="${.sh.match[2]}" + data.gid="${.sh.match[3]}" + [[ -v .sh.match[4] ]] && data.userlist="${.sh.match[4]}" + + return 0 +} + + +function accountdata2linuxscript +{ + set -o nounset + + nameref accountdata=$1 + typeset gidlist='' + typeset sidname + + # + # first start with the groups, as useradd wants a group to be there + # + integer i + + for ((i=0 ; i < ${#accountdata.group_list[@]} ; i++ )) ; do + nameref currgrp=accountdata.group_list[$i] + + # + # Cygwin was Win32 SID values in "encrypted_passwd", + # we use this to reject groups which have special + # functions in Win32 + sidname="${currgrp.encrypted_passwd}" + # check if "sidname" is realy a Win32 SID + if [[ "$sidname" == ~(El)S-1-[[:digit:]]+-[[:digit:]]+ ]] ; then + if [[ "$sidname" != ~(Elr)S-1-5-21-.+ ]] ; then + continue + fi + fi + + printf 'groupadd -g %s %q\n' "${currgrp.gid}" "${currgrp.group_name}" + + [[ "$gidlist" != '' ]] && gidlist+=',' + gidlist+="${currgrp.gid}" + done + + # + # user data itself + # + nameref curruser=accountdata.user + + printf 'mkdir -p %q\n' "${curruser.homedir}" + printf 'useradd -u %s -g %s -G %q -s %q %q\n' \ + "${curruser.uid}" \ + "${curruser.gid}" \ + "${gidlist}" \ + "${curruser.shell}" \ + "${curruser.login_name}" + printf 'chown %q %q\n' \ + "${curruser.uid}:${curruser.gid}" \ + "${curruser.homedir}" + + return 0 +} + + +function convert_curruser2linuxscript +{ + compound account_data + compound account_data.user + compound -a account_data.group_list + integer i=0 + typeset currgroup + + getent_passwd2compound account_data.user "$(id -u)" + + for currgroup in $(id -G) ; do + getent_group2compound account_data.group_list[$((i++))] "$currgroup" + done + + print -v account_data + + accountdata2linuxscript account_data + + # fixme: we need to figure out the real NFSv4 idmapping domain of the client + printf 'printf "Domain = GLOBAL.LOC\\n" >>"/etc/idmapd.conf"\n' + + printf 'printf "options nfsd nfs4_disable_idmapping=N\\noptions nfs nfs4_disable_idmapping=N\\n" >>"/etc/modprobe.d/nfs.conf"\n' + printf 'printf "NEED_IDMAPD=yes\\n" >>"/etc/default/nfs-common"\n' + + return 0 +} + + +# +# ToDo: +# - Command-line options +# - Convert current user+groups to Linux bash script [done] +# - Convert current user+groups to /etc/passwd+/etc/group lines +# - Convert given user+groups to Linux bash script +# - Convert given user+groups to /etc/passwd+/etc/group lines +# +function main +{ + convert_curruser2linuxscript "$@" + return $? +} + +builtin id + +main "$@" +return $? + + +# EOF. -- 2.45.1 From b48de242a7769fcaba7b698ac4aac8480e952694 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Thu, 25 Jul 2024 21:09:27 +0200 Subject: [PATCH 6/6] cygwin: cygwinaccount2nfs4account: Put "Domain" in "[General]" section cygwinaccount2nfs4account: Put "Domain" in "[General]" section Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- .../cygwinaccount2nfs4account.ksh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cygwin/utils/cygwinaccount2nfs4account/cygwinaccount2nfs4account.ksh b/cygwin/utils/cygwinaccount2nfs4account/cygwinaccount2nfs4account.ksh index 5979eb9..f765276 100644 --- a/cygwin/utils/cygwinaccount2nfs4account/cygwinaccount2nfs4account.ksh +++ b/cygwin/utils/cygwinaccount2nfs4account/cygwinaccount2nfs4account.ksh @@ -203,7 +203,12 @@ function convert_curruser2linuxscript accountdata2linuxscript account_data # fixme: we need to figure out the real NFSv4 idmapping domain of the client - printf 'printf "Domain = GLOBAL.LOC\\n" >>"/etc/idmapd.conf"\n' + + printf '# turn idmapper on, even for AUTH_SYS\n' + printf '{\n' + printf '\tprintf "[General]\\n"\n' + printf '\tprintf "Domain = %s\\n"\n' "GLOBAL.LOC" + printf '} >>"/etc/idmapd.conf"\n' printf 'printf "options nfsd nfs4_disable_idmapping=N\\noptions nfs nfs4_disable_idmapping=N\\n" >>"/etc/modprobe.d/nfs.conf"\n' printf 'printf "NEED_IDMAPD=yes\\n" >>"/etc/default/nfs-common"\n' -- 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