diff --git a/libgpo/admx/en-US/samba.adml b/libgpo/admx/en-US/samba.adml index 3bfb30c5649..133ed9c26ae 100755 --- a/libgpo/admx/en-US/samba.adml +++ b/libgpo/admx/en-US/samba.adml @@ -323,13 +323,13 @@ Example: 4194304 The time in milliseconds that smbd should keep waiting to see if a failed lock request can be granted. This parameter has changed in default value from Samba 3.0.23 from 10 to 200. The associated parameter is no longer used in Samba 3.0.24. You should not need to change the value of this parameter. oplock break wait time This is a tuning parameter added due to bugs in both Windows 9x and WinNT. If Samba responds to a client too quickly when that client issues an SMB that can cause an oplock break request, then the network client can fail and not respond to the break request. This tuning parameter (which is set in milliseconds) is the amount of time Samba will wait before sending an oplock break request to such (broken) clients. - DO NOT CHANGE THIS PARAMETER UNLESS YOU HAVE READ AND UNDERSTOOD THE SAMBA OPLOCK CODE. - smb2 leases - This boolean option tells smbd whether to globally negotiate SMB2 leases on file open requests. Leasing is an SMB2-only feature which allows clients to aggressively cache files locally above and beyond the caching allowed by SMB1 oplocks. - This is only available with yes and no. - debug class - With this boolean parameter enabled, the debug class (DBGC_CLASS) - will be displayed in the debug header. + DO NOT CHANGE THIS PARAMETER UNLESS YOU HAVE READ AND UNDERSTOOD THE SAMBA OPLOCK CODE. + smb2 leases + This boolean option tells smbd whether to globally negotiate SMB2 leases on file open requests. Leasing is an SMB2-only feature which allows clients to aggressively cache files locally above and beyond the caching allowed by SMB1 oplocks. + This is only available with yes and no. + debug class + With this boolean parameter enabled, the debug class (DBGC_CLASS) + will be displayed in the debug header. For more information about currently available debug classes, see @@ -1198,8 +1198,8 @@ Example: SMB3_11 LANMAN1: First modern version of the protocol. Long filename support. LANMAN2: Updates to Lanman1 protocol. NT1: Current up to date version of the protocol. Used by Windows NT. Known as CIFS. - SMB2: Re-implementation of the SMB protocol. Used by Windows Vista and later versions of Windows. SMB2 has sub protocols available. SMB2_02: The earliest SMB2 version. SMB2_10: Windows 7 SMB2 version. By default SMB2 selects the SMB2_10 variant. - SMB3: The same as SMB2. Used by Windows 8. SMB3 has sub protocols available. SMB3_00: Windows 8 SMB3 version. SMB3_02: Windows 8.1 SMB3 version. SMB3_11: Windows 10 SMB3 version. By default SMB3 selects the SMB3_11 variant. + SMB2: Re-implementation of the SMB protocol. Used by Windows Vista and later versions of Windows. SMB2 has sub protocols available. SMB2_02: The earliest SMB2 version. SMB2_10: Windows 7 SMB2 version. By default SMB2 selects the SMB2_10 variant. + SMB3: The same as SMB2. Used by Windows 8. SMB3 has sub protocols available. SMB3_00: Windows 8 SMB3 version. SMB3_02: Windows 8.1 SMB3 version. SMB3_11: Windows 10 SMB3 version. By default SMB3 selects the SMB3_11 variant. Normally this option should not be set as the automatic @@ -1386,8 +1386,8 @@ In general this parameter should be viewed as a system tuning tool and left seve LANMAN1: First modern version of the protocol. Long filename support. LANMAN2: Updates to Lanman1 protocol. NT1: Current up to date version of the protocol. Used by Windows NT. Known as CIFS. - SMB2: Re-implementation of the SMB protocol. Used by Windows Vista and later versions of Windows. SMB2 has sub protocols available. SMB2_02: The earliest SMB2 version. SMB2_10: Windows 7 SMB2 version. By default SMB2 selects the SMB2_10 variant. - SMB3: The same as SMB2. Used by Windows 8. SMB3 has sub protocols available. SMB3_00: Windows 8 SMB3 version. SMB3_02: Windows 8.1 SMB3 version. SMB3_11: Windows 10 SMB3 version. By default SMB3 selects the SMB3_11 variant. + SMB2: Re-implementation of the SMB protocol. Used by Windows Vista and later versions of Windows. SMB2 has sub protocols available. SMB2_02: The earliest SMB2 version. SMB2_10: Windows 7 SMB2 version. By default SMB2 selects the SMB2_10 variant. + SMB3: The same as SMB2. Used by Windows 8. SMB3 has sub protocols available. SMB3_00: Windows 8 SMB3 version. SMB3_02: Windows 8.1 SMB3 version. SMB3_11: Windows 10 SMB3 version. By default SMB3 selects the SMB3_11 variant. Normally this option should not be set as the automatic diff --git a/libgpo/admx/ru-RU/samba.adml b/libgpo/admx/ru-RU/samba.adml index 88b838b0360..7ecec41e737 100644 --- a/libgpo/admx/ru-RU/samba.adml +++ b/libgpo/admx/ru-RU/samba.adml @@ -2410,7 +2410,7 @@ smb2 disable oplock break retry = no Значение по умолчанию: allow dcerpc auth level connect = no allow trusted domains - Этот параметр действует только в том случае, если параметр 'security' установлен в значение server, domain или ads. + Этот параметр действует только в том случае, если параметр 'security' установлен в значение server, domain или ads. Если 'allow trusted domains = no', то попытки подключиться к ресурсу из домена или рабочей группы, отличной от той, в которой запущен smbd, завершатся ошибкой, даже если этому домену доверяет удаленный сервер, выполняющий аутентификацию. Это полезно, если необходимо, чтобы сервер Samba обслуживал запросы только пользователей домена, членом которого он является. В качестве примера предположим, что есть два домена DOMA и DOMB. DOMB доверяет DOMA, который содержит сервер Samba. При нормальных обстоятельствах пользователь с учетной записью в DOMB может затем получить доступ к ресурсам учетной записи UNIX с тем же именем учетной записи на сервере Samba, даже если у него нет учетной записи в DOMA. Это может затруднить реализацию границы безопасности.