updated version following David Howell's suggestion for using if/endif to fix the indentation On Sun, Jan 29, 2023 at 6:01 PM Steve French <smfrench@xxxxxxxxx> wrote: > > Fix indentation of server config options, and also since > support for very old, less secure, NTLM authentication was removed > (and quite a while ago), remove the mention of that in Kconfig, but > do note Kerberos (not just NTLMv2) which are supported and much > more secure. > > Signed-off-by: Steve French <stfrench@xxxxxxxxxxxxx> > --- > fs/ksmbd/Kconfig | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/fs/ksmbd/Kconfig b/fs/ksmbd/Kconfig > index e1fe17747ed6..4153e5491435 100644 > --- a/fs/ksmbd/Kconfig > +++ b/fs/ksmbd/Kconfig > @@ -33,17 +33,18 @@ config SMB_SERVER > in ksmbd-tools, available from > https://github.com/cifsd-team/ksmbd-tools. > More detail about how to run the ksmbd kernel server is > - available via README file > + available via the README file > (https://github.com/cifsd-team/ksmbd-tools/blob/master/README). > > ksmbd kernel server includes support for auto-negotiation, > Secure negotiate, Pre-authentication integrity, oplock/lease, > compound requests, multi-credit, packet signing, RDMA(smbdirect), > smb3 encryption, copy-offload, secure per-user session > - establishment via NTLM or NTLMv2. > + establishment via Kerberos or NTLMv2. > > config SMB_SERVER_SMBDIRECT > bool "Support for SMB Direct protocol" > + depends on SMB_SERVER > depends on SMB_SERVER=m && INFINIBAND && INFINIBAND_ADDR_TRANS || > SMB_SERVER=y && INFINIBAND=y && INFINIBAND_ADDR_TRANS=y > select SG_POOL > default n > > -- > Thanks, > > Steve -- Thanks, Steve
From a3371b36d346f9756016e5321acebc2daab9686b Mon Sep 17 00:00:00 2001 From: Steve French <stfrench@xxxxxxxxxxxxx> Date: Sun, 29 Jan 2023 17:49:59 -0600 Subject: [PATCH 1/2] ksmbd: update Kconfig to note Kerberos support and fix indentation Fix indentation of server config options, and also since support for very old, less secure, NTLM authentication was removed (and quite a while ago), remove the mention of that in Kconfig, but do note Kerberos (not just NTLMv2) which are supported and much more secure. Acked-by: Namjae Jeon <linkinjeon@xxxxxxxxxx> Acked-by: David Howells <dhowells@xxxxxxxxxx> Signed-off-by: Steve French <stfrench@xxxxxxxxxxxxx> --- fs/ksmbd/Kconfig | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fs/ksmbd/Kconfig b/fs/ksmbd/Kconfig index e1fe17747ed6..7055cb5d2880 100644 --- a/fs/ksmbd/Kconfig +++ b/fs/ksmbd/Kconfig @@ -33,14 +33,16 @@ config SMB_SERVER in ksmbd-tools, available from https://github.com/cifsd-team/ksmbd-tools. More detail about how to run the ksmbd kernel server is - available via README file + available via the README file (https://github.com/cifsd-team/ksmbd-tools/blob/master/README). ksmbd kernel server includes support for auto-negotiation, Secure negotiate, Pre-authentication integrity, oplock/lease, compound requests, multi-credit, packet signing, RDMA(smbdirect), smb3 encryption, copy-offload, secure per-user session - establishment via NTLM or NTLMv2. + establishment via Kerberos or NTLMv2. + +if SMB_SERVER config SMB_SERVER_SMBDIRECT bool "Support for SMB Direct protocol" @@ -54,6 +56,8 @@ config SMB_SERVER_SMBDIRECT SMB Direct allows transferring SMB packets over RDMA. If unsure, say N. +endif + config SMB_SERVER_CHECK_CAP_NET_ADMIN bool "Enable check network administration capability" depends on SMB_SERVER -- 2.34.1
