diff options
| author | yar <yar@FreeBSD.org> | 2006-03-05 22:52:17 +0000 |
|---|---|---|
| committer | yar <yar@FreeBSD.org> | 2006-03-05 22:52:17 +0000 |
| commit | 66715ad5a3d7d2253ba5215689c262551c691bc6 (patch) | |
| tree | 42d69dbc46168ef705cc8d1fdd34c38e8020ff20 /sys/modules | |
| parent | 5d4e90d7750c8099d9fafe80c202756922b60e01 (diff) | |
| download | FreeBSD-src-66715ad5a3d7d2253ba5215689c262551c691bc6.zip FreeBSD-src-66715ad5a3d7d2253ba5215689c262551c691bc6.tar.gz | |
Retire NETSMBCRYPTO as a kernel option and make its functionality
enabled by default in NETSMB and smbfs.ko.
With the most of modern SMB providers requiring encryption by
default, there is little sense left in keeping the crypto part
of NETSMB optional at the build time.
This will also return smbfs.ko to its former properties users
are rather accustomed to.
Discussed with: freebsd-stable, re (scottl)
Not objected by: bp, tjr (silence)
MFC after: 5 days
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/smbfs/Makefile | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sys/modules/smbfs/Makefile b/sys/modules/smbfs/Makefile index bc4316d..e8432e3 100644 --- a/sys/modules/smbfs/Makefile +++ b/sys/modules/smbfs/Makefile @@ -19,16 +19,13 @@ SRCS= vnode_if.h \ smbfs_vfsops.c smbfs_node.c smbfs_io.c smbfs_vnops.c \ smbfs_subr.c smbfs_smb.c -NETSMBCRYPTO= - -.if defined(NETSMBCRYPTO) +# NETSMBCRYPTO SRCS+= des_ecb.c des_setkey.c .if ${MACHINE_ARCH} == "i386" SRCS+= des_enc.S .else SRCS+= des_enc.c .endif -.endif # Build with IPX support (1|0) SMB_IPX?= 0 @@ -52,12 +49,6 @@ opt_inet.h: opt_ipx.h: echo "#define IPX 1" > ${.TARGET} .endif - -# XXX netsmb should be a separate module -.if defined(NETSMBCRYPTO) -opt_netsmb.h: - echo "#define NETSMBCRYPTO 1" > ${.TARGET} -.endif .endif .include <bsd.kmod.mk> |
