diff options
| author | Yaroslav Tykhiy <ytykhiy@gmail.com> | 2006-03-05 22:52:17 +0000 |
|---|---|---|
| committer | Yaroslav Tykhiy <ytykhiy@gmail.com> | 2006-03-05 22:52:17 +0000 |
| commit | 8d96e455313f137de3023d7c893b4b24975c47bb (patch) | |
| tree | 42d69dbc46168ef705cc8d1fdd34c38e8020ff20 /sys/netsmb/smb_smb.c | |
| parent | 62fba1c39711542435d617d34d6849485d0fa8c7 (diff) | |
| download | src-8d96e455313f137de3023d7c893b4b24975c47bb.tar.gz src-8d96e455313f137de3023d7c893b4b24975c47bb.zip | |
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
Notes
Notes:
svn path=/head/; revision=156326
Diffstat (limited to 'sys/netsmb/smb_smb.c')
| -rw-r--r-- | sys/netsmb/smb_smb.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sys/netsmb/smb_smb.c b/sys/netsmb/smb_smb.c index 953456e1c85f..6393a9f05565 100644 --- a/sys/netsmb/smb_smb.c +++ b/sys/netsmb/smb_smb.c @@ -197,10 +197,8 @@ smb_smb_negotiate(struct smb_vc *vcp, struct smb_cred *scred) vcp->vc_chlen = sblen; vcp->obj.co_flags |= SMBV_ENCRYPT; } -#ifdef NETSMBCRYPTO if (sp->sv_sm & SMB_SM_SIGS_REQUIRE) vcp->vc_hflags2 |= SMB_FLAGS2_SECURITY_SIGNATURE; -#endif vcp->vc_hflags2 |= SMB_FLAGS2_KNOWS_LONG_NAMES; if (dp->d_id == SMB_DIALECT_NTLM0_12 && sp->sv_maxtx < 4096 && |