libgpo: fix wrong lineending in admx files

When changing or reviewing admx file patches, make sure, that those files are
dos fileformat and they need to have the magic ^M at the end of each line ...

Signed-off-by: Bjoern Jacke <bjacke@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/libgpo/admx/en-US/samba.adml b/libgpo/admx/en-US/samba.adml
index 3bfb30c564920abbc38d6b0c103e73b2c93b5527..133ed9c26aec87ef987af850eb7dc4b4fb4f2491 100755 (executable)
--- a/libgpo/admx/en-US/samba.adml
+++ b/libgpo/admx/en-US/samba.adml
@@ -323,13 +323,13 @@ Example: 4194304</string>
       <string id="POL_B3B2B9CC_3DBC_5C45_AA31_7C1E52AFEFAF_Help">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.</string>\r
       <string id="POL_4A0366F2_6815_5654_8DC2_F68E840E53F4">oplock break wait time</string>\r
       <string id="POL_4A0366F2_6815_5654_8DC2_F68E840E53F4_Help">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.\r
- DO NOT CHANGE THIS PARAMETER UNLESS YOU HAVE READ AND UNDERSTOOD THE SAMBA OPLOCK CODE.</string>
-      <string id="POL_B49FAE41_B4C1_5AFA_870E_9E1C35F9A96F">smb2 leases</string>
-      <string id="POL_B49FAE41_B4C1_5AFA_870E_9E1C35F9A96F_Help">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.</string>
-      <string id="POL_1E9B5BE6_8C81_5141_88CD_B5AC0E8D964B">debug class</string>
-      <string id="POL_1E9B5BE6_8C81_5141_88CD_B5AC0E8D964B_Help">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.</string>\r
+      <string id="POL_B49FAE41_B4C1_5AFA_870E_9E1C35F9A96F">smb2 leases</string>\r
+      <string id="POL_B49FAE41_B4C1_5AFA_870E_9E1C35F9A96F_Help">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.\r
+ This is only available with yes and no.</string>\r
+      <string id="POL_1E9B5BE6_8C81_5141_88CD_B5AC0E8D964B">debug class</string>\r
+      <string id="POL_1E9B5BE6_8C81_5141_88CD_B5AC0E8D964B_Help">With this boolean parameter enabled, the debug class (DBGC_CLASS)\r
+ will be displayed in the debug header.\r
 \r
 \r
  For more information about currently available debug classes, see\r
@@ -1198,8 +1198,8 @@ Example: SMB3_11</string>
  LANMAN1: First modern version of the protocol. Long filename support.\r
  LANMAN2: Updates to Lanman1 protocol.\r
  NT1: Current up to date version of the protocol. Used by Windows NT. Known as CIFS.\r
- 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.\r
+ 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.\r
 \r
 \r
  Normally this option should not be set as the automatic\r
@@ -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.\r
  LANMAN2: Updates to Lanman1 protocol.\r
  NT1: Current up to date version of the protocol. Used by Windows NT. Known as CIFS.\r
- 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.\r
+ 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.\r
 \r
 \r
  Normally this option should not be set as the automatic\r

diff --git a/libgpo/admx/ru-RU/samba.adml b/libgpo/admx/ru-RU/samba.adml
index 88b838b0360ff60a67e8e730cbad2f4ecc63ba14..7ecec41e7371dbb39ccd1c8919371af7b3643f0e 100644 (file)
--- a/libgpo/admx/ru-RU/samba.adml
+++ b/libgpo/admx/ru-RU/samba.adml
@@ -2410,7 +2410,7 @@ smb2 disable oplock break retry = no</string>
 Значение по умолчанию:\r
 allow dcerpc auth level connect = no</string>\r
       <string id="POL_F3A8A539_E774_5498_B8B7_5D295841A159">allow trusted domains</string>\r
-      <string id="POL_F3A8A539_E774_5498_B8B7_5D295841A159_Help">Этот параметр действует только в том случае, если параметр 'security' установлен в значение server, domain или ads.
+      <string id="POL_F3A8A539_E774_5498_B8B7_5D295841A159_Help">Этот параметр действует только в том случае, если параметр 'security' установлен в значение server, domain или ads.\r
        Если 'allow trusted domains = no', то попытки подключиться к ресурсу из домена или рабочей группы, отличной от той, в которой запущен smbd, завершатся ошибкой, даже если этому домену доверяет удаленный сервер, выполняющий аутентификацию.\r
 \r
 Это полезно, если необходимо, чтобы сервер Samba обслуживал запросы только пользователей домена, членом которого он является. В качестве примера предположим, что есть два домена DOMA и DOMB. DOMB доверяет DOMA, который содержит сервер Samba. При нормальных обстоятельствах пользователь с учетной записью в DOMB может затем получить доступ к ресурсам учетной записи UNIX с тем же именем учетной записи на сервере Samba, даже если у него нет учетной записи в DOMA. Это может затруднить реализацию границы безопасности.\r