The branch, master has been updated via 6248eab5103 mangle_hash2: remove LOCK$ from list of reserved names via c653f8054ea mangle_hash2: add missing COM/LPT ports that are also reserved names via 24c09f913d8 ntvfs: add missing COM/LPT ports that are also reserved names from 2a20c8b2b16 rpcclient: Add unixinfo commands
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 6248eab51039712b183df915533a76378f48e138 Author: Björn Jacke <b...@sernet.de> Date: Mon Jun 28 17:00:54 2021 +0200 mangle_hash2: remove LOCK$ from list of reserved names see also: https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file?redirectedfrom=MSDN BUG: https://bugzilla.samba.org/show_bug.cgi?id=8776 Signed-off-by: Bjoern Jacke <bja...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Jeremy Allison <j...@samba.org> Autobuild-Date(master): Tue Aug 24 19:26:59 UTC 2021 on sn-devel-184 commit c653f8054ea222e0609c98c0121f2e0a26a5954f Author: Björn Jacke <b...@sernet.de> Date: Mon Jun 28 16:56:18 2021 +0200 mangle_hash2: add missing COM/LPT ports that are also reserved names see also: https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file?redirectedfrom=MSDN BUG: https://bugzilla.samba.org/show_bug.cgi?id=8776 Signed-off-by: Bjoern Jacke <bja...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> commit 24c09f913d82528ada14013e3d673d277cf04a93 Author: Björn Jacke <b...@sernet.de> Date: Mon Jun 28 16:55:04 2021 +0200 ntvfs: add missing COM/LPT ports that are also reserved names see also: https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file?redirectedfrom=MSDN BUG: https://bugzilla.samba.org/show_bug.cgi?id=8776 Signed-off-by: Bjoern Jacke <bja...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> ----------------------------------------------------------------------- Summary of changes: source3/smbd/mangle_hash2.c | 6 ++++-- source4/ntvfs/posix/pvfs_shortname.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/mangle_hash2.c b/source3/smbd/mangle_hash2.c index 92319495f2a..53e944ef61b 100644 --- a/source3/smbd/mangle_hash2.c +++ b/source3/smbd/mangle_hash2.c @@ -101,8 +101,10 @@ static const char basechars[36] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; /* the list of reserved dos names - all of these are illegal */ static const char * const reserved_names[] = -{ "AUX", "LOCK$", "CON", "COM1", "COM2", "COM3", "COM4", - "LPT1", "LPT2", "LPT3", "NUL", "PRN", NULL }; +{ "AUX", "CON", + "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9", + "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9", + "NUL", "PRN", NULL }; #define DYNAMIC_MANGLE_TABLES 0 diff --git a/source4/ntvfs/posix/pvfs_shortname.c b/source4/ntvfs/posix/pvfs_shortname.c index 46a235429aa..902ff23d88f 100644 --- a/source4/ntvfs/posix/pvfs_shortname.c +++ b/source4/ntvfs/posix/pvfs_shortname.c @@ -80,8 +80,10 @@ #define FLAG_CHECK(c, flag) (ctx->char_flags[(uint8_t)(c)] & (flag)) static const char *reserved_names[] = -{ "AUX", "CON", "COM1", "COM2", "COM3", "COM4", - "LPT1", "LPT2", "LPT3", "NUL", "PRN", NULL }; +{ "AUX", "CON", + "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9" + "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9", + "NUL", "PRN", NULL }; struct pvfs_mangle_context { -- Samba Shared Repository