Merge pull request multipath-tcp#46 from namjaejeon/cifsd-for-next

cifsd-fixes
dcaratti · May 11, 2021 · 2018da7 · 2018da7
2 parents bcd62a3 + 5ce0716
commit 2018da7
Show file tree

Hide file tree

Showing 6 changed files with 222 additions and 510 deletions.
diff --git a/fs/cifsd/Kconfig b/fs/cifsd/Kconfig
@@ -17,6 +17,7 @@ config SMB_SERVER
  select CRYPTO_AEAD2
  select CRYPTO_CCM
  select CRYPTO_GCM
+ select ASN1
  default n
  help
  Choose Y here if you want to allow SMB3 compliant clients

diff --git a/fs/cifsd/Makefile b/fs/cifsd/Makefile
@@ -4,10 +4,14 @@
 #
 obj-$(CONFIG_SMB_SERVER) += ksmbd.o
 
+$(obj)/spnego_negtokeninit.asn1.o: $(obj)/spnego_negtokeninit.asn1.c $(obj)/spnego_negtokeninit.asn1.h
+$(obj)/spnego_negtokentarg.asn1.o: $(obj)/spnego_negtokentarg.asn1.c $(obj)/spnego_negtokentarg.asn1.h
+
 ksmbd-y := unicode.o auth.o vfs.o vfs_cache.o server.o buffer_pool.o \
  misc.o oplock.o connection.o ksmbd_work.o crypto_ctx.o \
  mgmt/ksmbd_ida.o mgmt/user_config.o mgmt/share_config.o \
  mgmt/tree_connect.o mgmt/user_session.o smb_common.o \
  transport_tcp.o transport_ipc.o smbacl.o smb2pdu.o \
- smb2ops.o smb2misc.o asn1.o ndr.o
+ smb2ops.o smb2misc.o spnego_negtokeninit.asn1.o \
+ spnego_negtokentarg.asn1.o asn1.o ndr.o
 ksmbd-$(CONFIG_SMB_SERVER_SMBDIRECT) += transport_rdma.o