diff options
| author | ian <ian@FreeBSD.org> | 2016-01-19 23:36:49 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2016-01-19 23:36:49 +0000 |
| commit | 2651e6b1c65c3a49c9390393bd44d1fc1d428f42 (patch) | |
| tree | cc26d366f4adcf2eea35d63ffc8904941d69dcad /lib | |
| parent | 223081e0c89077309760cd2f5ce595677493432e (diff) | |
| download | FreeBSD-src-2651e6b1c65c3a49c9390393bd44d1fc1d428f42.zip FreeBSD-src-2651e6b1c65c3a49c9390393bd44d1fc1d428f42.tar.gz | |
MFC r292337, r292552, r292553:
Build mount_smbfs for arm. Also sort the subdirs.
Avoid unaligned memory accesses when encoding netbios names in libsmb.
The current code for encoding a netbios name converts each byte to a 16-bit
value and stores the result by casting a char* to u_short*, resulting in
alignment faults on strict-alignment platforms.
This change reimplements the encoding routine using only byte accesses to
memory. There is no particular reason to work with 16-bit values just
because the encoding process creates two bytes of output for every byte of
input. Working a byte at at time also avoids endian problems for big-endian
platforms.
Make the building of libsmb and mount_smbfs unconditional, now that r292552
has eliminated alignment and endian problems that were making it fail on
some platforms.
PR: 180438
PR: 189415
Relnotes: Yes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/Makefile b/lib/Makefile index 250d583..742bd5e 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -84,7 +84,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ libsbuf \ ${_libsdp} \ ${_libsm} \ - ${_libsmb} \ + libsmb \ ${_libsmdb} \ ${_libsmutil} \ libstand \ @@ -214,7 +214,6 @@ _libypclnt= libypclnt .endif .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" -_libsmb= libsmb _libvgl= libvgl _libproc= libproc _librtld_db= librtld_db @@ -228,7 +227,6 @@ _libvmmapi= libvmmapi .if ${MACHINE_CPUARCH} == "ia64" _libefi= libefi -_libsmb= libsmb .endif .if ${MACHINE_CPUARCH} == "mips" @@ -239,11 +237,6 @@ _librtld_db= librtld_db .if ${MACHINE_CPUARCH} == "powerpc" _libproc= libproc _librtld_db= librtld_db -_libsmb= libsmb -.endif - -.if ${MACHINE_CPUARCH} == "sparc64" -_libsmb= libsmb .endif .if ${MK_OPENSSL} != "no" |
