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 /usr.sbin | |
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 'usr.sbin')
-rw-r--r-- | usr.sbin/Makefile | 1 | ||||
-rw-r--r-- | usr.sbin/Makefile.amd64 | 1 | ||||
-rw-r--r-- | usr.sbin/Makefile.arm | 2 | ||||
-rw-r--r-- | usr.sbin/Makefile.i386 | 1 | ||||
-rw-r--r-- | usr.sbin/Makefile.ia64 | 1 | ||||
-rw-r--r-- | usr.sbin/Makefile.powerpc | 1 | ||||
-rw-r--r-- | usr.sbin/Makefile.sparc64 | 1 |
7 files changed, 2 insertions, 6 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 8e97961..fccef4a 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -44,6 +44,7 @@ SUBDIR= adduser \ mixer \ mlxcontrol \ mountd \ + mount_smbfs \ mptutil \ mtest \ ${_mtree} \ diff --git a/usr.sbin/Makefile.amd64 b/usr.sbin/Makefile.amd64 index 3f40974..0fdccaf 100644 --- a/usr.sbin/Makefile.amd64 +++ b/usr.sbin/Makefile.amd64 @@ -25,7 +25,6 @@ SUBDIR+= hyperv .endif SUBDIR+= kgmon SUBDIR+= lptcontrol -SUBDIR+= mount_smbfs SUBDIR+= mptable .if ${MK_NDIS} != "no" SUBDIR+= ndiscvt diff --git a/usr.sbin/Makefile.arm b/usr.sbin/Makefile.arm index b21bc52..84cff4a 100644 --- a/usr.sbin/Makefile.arm +++ b/usr.sbin/Makefile.arm @@ -1,4 +1,4 @@ # $FreeBSD$ -SUBDIR+= ofwdump SUBDIR+= kgmon +SUBDIR+= ofwdump diff --git a/usr.sbin/Makefile.i386 b/usr.sbin/Makefile.i386 index de7bb46..1aae5a3 100644 --- a/usr.sbin/Makefile.i386 +++ b/usr.sbin/Makefile.i386 @@ -15,7 +15,6 @@ SUBDIR+= hyperv SUBDIR+= kgmon SUBDIR+= kgzip SUBDIR+= lptcontrol -SUBDIR+= mount_smbfs SUBDIR+= mptable .if ${MK_NDIS} != "no" SUBDIR+= ndiscvt diff --git a/usr.sbin/Makefile.ia64 b/usr.sbin/Makefile.ia64 index 0a897b4..d047b33 100644 --- a/usr.sbin/Makefile.ia64 +++ b/usr.sbin/Makefile.ia64 @@ -4,6 +4,5 @@ SUBDIR+= acpi .endif SUBDIR+= kgmon -SUBDIR+= mount_smbfs SUBDIR:= ${SUBDIR:Nuathload} SUBDIR+= zzz diff --git a/usr.sbin/Makefile.powerpc b/usr.sbin/Makefile.powerpc index 8833a27..131eb57 100644 --- a/usr.sbin/Makefile.powerpc +++ b/usr.sbin/Makefile.powerpc @@ -1,5 +1,4 @@ # $FreeBSD$ -SUBDIR+= mount_smbfs SUBDIR+= nvram SUBDIR+= ofwdump diff --git a/usr.sbin/Makefile.sparc64 b/usr.sbin/Makefile.sparc64 index 632b3a8..81f7a9b 100644 --- a/usr.sbin/Makefile.sparc64 +++ b/usr.sbin/Makefile.sparc64 @@ -1,5 +1,4 @@ # $FreeBSD$ SUBDIR+= eeprom -SUBDIR+= mount_smbfs SUBDIR+= ofwdump |