[PATCH 3/7] Documentation, arch: Remove leftovers from CIFS_WEAK_PW_HASH
Steve French
smfrench at gmail.com
Mon Dec 13 07:14:18 AEDT 2021
You can add my RB is you would like to this.
Also note an additional typo in the existing config description
"laintext" instead of "plaintext"
On Fri, Nov 5, 2021 at 11:11 AM Alexandre Ghiti
<alexandre.ghiti at canonical.com> wrote:
>
> This config was removed so remove all references to it.
>
> Fixes: 76a3c92ec9e0 ("cifs: remove support for NTLM and weaker authentication algorithms")
> Signed-off-by: Alexandre Ghiti <alexandre.ghiti at canonical.com>
> ---
> Documentation/admin-guide/cifs/usage.rst | 7 +++----
> arch/arm/configs/cm_x300_defconfig | 1 -
> arch/arm/configs/ezx_defconfig | 1 -
> arch/arm/configs/imote2_defconfig | 1 -
> arch/arm/configs/nhk8815_defconfig | 1 -
> arch/arm/configs/pxa_defconfig | 1 -
> arch/mips/configs/fuloong2e_defconfig | 1 -
> arch/mips/configs/malta_qemu_32r6_defconfig | 1 -
> arch/mips/configs/maltaaprp_defconfig | 1 -
> arch/mips/configs/maltasmvp_defconfig | 1 -
> arch/mips/configs/maltasmvp_eva_defconfig | 1 -
> arch/mips/configs/maltaup_defconfig | 1 -
> arch/mips/configs/nlm_xlp_defconfig | 1 -
> arch/mips/configs/nlm_xlr_defconfig | 1 -
> arch/powerpc/configs/ppc6xx_defconfig | 1 -
> arch/sh/configs/titan_defconfig | 1 -
> 16 files changed, 3 insertions(+), 19 deletions(-)
>
> diff --git a/Documentation/admin-guide/cifs/usage.rst b/Documentation/admin-guide/cifs/usage.rst
> index f170d8820258..3766bf8a1c20 100644
> --- a/Documentation/admin-guide/cifs/usage.rst
> +++ b/Documentation/admin-guide/cifs/usage.rst
> @@ -734,10 +734,9 @@ SecurityFlags Flags which control security negotiation and
> using weaker password hashes is 0x37037 (lanman,
> plaintext, ntlm, ntlmv2, signing allowed). Some
> SecurityFlags require the corresponding menuconfig
> - options to be enabled (lanman and plaintext require
> - CONFIG_CIFS_WEAK_PW_HASH for example). Enabling
> - plaintext authentication currently requires also
> - enabling lanman authentication in the security flags
> + options to be enabled. Enabling plaintext
> + authentication currently requires also enabling
> + lanman authentication in the security flags
> because the cifs module only supports sending
> laintext passwords using the older lanman dialect
> form of the session setup SMB. (e.g. for authentication
> diff --git a/arch/arm/configs/cm_x300_defconfig b/arch/arm/configs/cm_x300_defconfig
> index 502a9d870ca4..45769d0ddd4e 100644
> --- a/arch/arm/configs/cm_x300_defconfig
> +++ b/arch/arm/configs/cm_x300_defconfig
> @@ -146,7 +146,6 @@ CONFIG_NFS_V3_ACL=y
> CONFIG_NFS_V4=y
> CONFIG_ROOT_NFS=y
> CONFIG_CIFS=m
> -CONFIG_CIFS_WEAK_PW_HASH=y
> CONFIG_PARTITION_ADVANCED=y
> CONFIG_NLS_CODEPAGE_437=m
> CONFIG_NLS_ISO8859_1=m
> diff --git a/arch/arm/configs/ezx_defconfig b/arch/arm/configs/ezx_defconfig
> index a49e699e52de..ec84d80096b1 100644
> --- a/arch/arm/configs/ezx_defconfig
> +++ b/arch/arm/configs/ezx_defconfig
> @@ -314,7 +314,6 @@ CONFIG_NFSD_V3_ACL=y
> CONFIG_SMB_FS=m
> CONFIG_CIFS=m
> CONFIG_CIFS_STATS=y
> -CONFIG_CIFS_WEAK_PW_HASH=y
> CONFIG_CIFS_XATTR=y
> CONFIG_CIFS_POSIX=y
> CONFIG_NLS_CODEPAGE_437=m
> diff --git a/arch/arm/configs/imote2_defconfig b/arch/arm/configs/imote2_defconfig
> index 118c4c927f26..6db871d4e077 100644
> --- a/arch/arm/configs/imote2_defconfig
> +++ b/arch/arm/configs/imote2_defconfig
> @@ -288,7 +288,6 @@ CONFIG_NFSD_V3_ACL=y
> CONFIG_SMB_FS=m
> CONFIG_CIFS=m
> CONFIG_CIFS_STATS=y
> -CONFIG_CIFS_WEAK_PW_HASH=y
> CONFIG_CIFS_XATTR=y
> CONFIG_CIFS_POSIX=y
> CONFIG_NLS_CODEPAGE_437=m
> diff --git a/arch/arm/configs/nhk8815_defconfig b/arch/arm/configs/nhk8815_defconfig
> index 23595fc5a29a..907d6512821a 100644
> --- a/arch/arm/configs/nhk8815_defconfig
> +++ b/arch/arm/configs/nhk8815_defconfig
> @@ -127,7 +127,6 @@ CONFIG_NFS_FS=y
> CONFIG_NFS_V3_ACL=y
> CONFIG_ROOT_NFS=y
> CONFIG_CIFS=m
> -CONFIG_CIFS_WEAK_PW_HASH=y
> CONFIG_NLS_CODEPAGE_437=y
> CONFIG_NLS_ASCII=y
> CONFIG_NLS_ISO8859_1=y
> diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig
> index 58f4834289e6..dedaaae3d0d8 100644
> --- a/arch/arm/configs/pxa_defconfig
> +++ b/arch/arm/configs/pxa_defconfig
> @@ -699,7 +699,6 @@ CONFIG_NFSD_V3_ACL=y
> CONFIG_NFSD_V4=y
> CONFIG_CIFS=m
> CONFIG_CIFS_STATS=y
> -CONFIG_CIFS_WEAK_PW_HASH=y
> CONFIG_CIFS_XATTR=y
> CONFIG_CIFS_POSIX=y
> CONFIG_NLS_DEFAULT="utf8"
> diff --git a/arch/mips/configs/fuloong2e_defconfig b/arch/mips/configs/fuloong2e_defconfig
> index 5c24ac7fdf56..ba47c5e929b7 100644
> --- a/arch/mips/configs/fuloong2e_defconfig
> +++ b/arch/mips/configs/fuloong2e_defconfig
> @@ -206,7 +206,6 @@ CONFIG_NFSD_V3_ACL=y
> CONFIG_NFSD_V4=y
> CONFIG_CIFS=m
> CONFIG_CIFS_STATS2=y
> -CONFIG_CIFS_WEAK_PW_HASH=y
> CONFIG_CIFS_XATTR=y
> CONFIG_CIFS_POSIX=y
> CONFIG_CIFS_DEBUG2=y
> diff --git a/arch/mips/configs/malta_qemu_32r6_defconfig b/arch/mips/configs/malta_qemu_32r6_defconfig
> index 614af02d83e6..6fb9bc29f4a0 100644
> --- a/arch/mips/configs/malta_qemu_32r6_defconfig
> +++ b/arch/mips/configs/malta_qemu_32r6_defconfig
> @@ -165,7 +165,6 @@ CONFIG_TMPFS=y
> CONFIG_NFS_FS=y
> CONFIG_ROOT_NFS=y
> CONFIG_CIFS=m
> -CONFIG_CIFS_WEAK_PW_HASH=y
> CONFIG_CIFS_XATTR=y
> CONFIG_CIFS_POSIX=y
> CONFIG_NLS_CODEPAGE_437=m
> diff --git a/arch/mips/configs/maltaaprp_defconfig b/arch/mips/configs/maltaaprp_defconfig
> index 9c051f8fd330..eb72df528243 100644
> --- a/arch/mips/configs/maltaaprp_defconfig
> +++ b/arch/mips/configs/maltaaprp_defconfig
> @@ -166,7 +166,6 @@ CONFIG_TMPFS=y
> CONFIG_NFS_FS=y
> CONFIG_ROOT_NFS=y
> CONFIG_CIFS=m
> -CONFIG_CIFS_WEAK_PW_HASH=y
> CONFIG_CIFS_XATTR=y
> CONFIG_CIFS_POSIX=y
> CONFIG_NLS_CODEPAGE_437=m
> diff --git a/arch/mips/configs/maltasmvp_defconfig b/arch/mips/configs/maltasmvp_defconfig
> index 2e90d97551d6..1fb40d310f49 100644
> --- a/arch/mips/configs/maltasmvp_defconfig
> +++ b/arch/mips/configs/maltasmvp_defconfig
> @@ -167,7 +167,6 @@ CONFIG_TMPFS=y
> CONFIG_NFS_FS=y
> CONFIG_ROOT_NFS=y
> CONFIG_CIFS=m
> -CONFIG_CIFS_WEAK_PW_HASH=y
> CONFIG_CIFS_XATTR=y
> CONFIG_CIFS_POSIX=y
> CONFIG_NLS_CODEPAGE_437=m
> diff --git a/arch/mips/configs/maltasmvp_eva_defconfig b/arch/mips/configs/maltasmvp_eva_defconfig
> index d1f7fdb27284..75cb778c6149 100644
> --- a/arch/mips/configs/maltasmvp_eva_defconfig
> +++ b/arch/mips/configs/maltasmvp_eva_defconfig
> @@ -169,7 +169,6 @@ CONFIG_TMPFS=y
> CONFIG_NFS_FS=y
> CONFIG_ROOT_NFS=y
> CONFIG_CIFS=m
> -CONFIG_CIFS_WEAK_PW_HASH=y
> CONFIG_CIFS_XATTR=y
> CONFIG_CIFS_POSIX=y
> CONFIG_NLS_CODEPAGE_437=m
> diff --git a/arch/mips/configs/maltaup_defconfig b/arch/mips/configs/maltaup_defconfig
> index 48e5bd492452..7b4f247dc60c 100644
> --- a/arch/mips/configs/maltaup_defconfig
> +++ b/arch/mips/configs/maltaup_defconfig
> @@ -165,7 +165,6 @@ CONFIG_TMPFS=y
> CONFIG_NFS_FS=y
> CONFIG_ROOT_NFS=y
> CONFIG_CIFS=m
> -CONFIG_CIFS_WEAK_PW_HASH=y
> CONFIG_CIFS_XATTR=y
> CONFIG_CIFS_POSIX=y
> CONFIG_NLS_CODEPAGE_437=m
> diff --git a/arch/mips/configs/nlm_xlp_defconfig b/arch/mips/configs/nlm_xlp_defconfig
> index c97f00ece828..1c8b73d03263 100644
> --- a/arch/mips/configs/nlm_xlp_defconfig
> +++ b/arch/mips/configs/nlm_xlp_defconfig
> @@ -459,7 +459,6 @@ CONFIG_NFSD=m
> CONFIG_NFSD_V3_ACL=y
> CONFIG_NFSD_V4=y
> CONFIG_CIFS=m
> -CONFIG_CIFS_WEAK_PW_HASH=y
> CONFIG_CIFS_UPCALL=y
> CONFIG_CIFS_XATTR=y
> CONFIG_CIFS_POSIX=y
> diff --git a/arch/mips/configs/nlm_xlr_defconfig b/arch/mips/configs/nlm_xlr_defconfig
> index 60ea102783d9..11acfc173058 100644
> --- a/arch/mips/configs/nlm_xlr_defconfig
> +++ b/arch/mips/configs/nlm_xlr_defconfig
> @@ -411,7 +411,6 @@ CONFIG_NFSD=m
> CONFIG_NFSD_V3_ACL=y
> CONFIG_NFSD_V4=y
> CONFIG_CIFS=m
> -CONFIG_CIFS_WEAK_PW_HASH=y
> CONFIG_CIFS_UPCALL=y
> CONFIG_CIFS_XATTR=y
> CONFIG_CIFS_POSIX=y
> diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
> index 6697c5e6682f..bb549cb1c3e3 100644
> --- a/arch/powerpc/configs/ppc6xx_defconfig
> +++ b/arch/powerpc/configs/ppc6xx_defconfig
> @@ -1022,7 +1022,6 @@ CONFIG_NFSD=m
> CONFIG_NFSD_V3_ACL=y
> CONFIG_NFSD_V4=y
> CONFIG_CIFS=m
> -CONFIG_CIFS_WEAK_PW_HASH=y
> CONFIG_CIFS_UPCALL=y
> CONFIG_CIFS_XATTR=y
> CONFIG_CIFS_POSIX=y
> diff --git a/arch/sh/configs/titan_defconfig b/arch/sh/configs/titan_defconfig
> index ba887f1351be..cd5c58916c65 100644
> --- a/arch/sh/configs/titan_defconfig
> +++ b/arch/sh/configs/titan_defconfig
> @@ -242,7 +242,6 @@ CONFIG_NFSD=y
> CONFIG_NFSD_V3=y
> CONFIG_SMB_FS=m
> CONFIG_CIFS=m
> -CONFIG_CIFS_WEAK_PW_HASH=y
> CONFIG_PARTITION_ADVANCED=y
> CONFIG_NLS_CODEPAGE_437=m
> CONFIG_NLS_ASCII=m
> --
> 2.32.0
>
--
Thanks,
Steve
More information about the Linuxppc-dev
mailing list