diff options
| author | Renato Botelho <renato@netgate.com> | 2016-09-12 14:46:05 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-09-12 14:46:05 -0300 |
| commit | 63ce22d1142390b88690c7c0f4bc4cc288e9d185 (patch) | |
| tree | be056ff742a6a5ce5b806df22ac305023d980bc0 /sbin | |
| parent | e2fb654fb7e1727e7fc2778c4c2fbd8b4733fe37 (diff) | |
| parent | 4fad802c4472b62f310fbda8601c80b846f7a1f0 (diff) | |
| download | FreeBSD-src-63ce22d1142390b88690c7c0f4bc4cc288e9d185.zip FreeBSD-src-63ce22d1142390b88690c7c0f4bc4cc288e9d185.tar.gz | |
Merge remote-tracking branch 'origin/stable/11' into devel-11
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/camcontrol/camcontrol.c | 2 | ||||
| -rw-r--r-- | sbin/hastd/lzf.h | 6 | ||||
| -rw-r--r-- | sbin/resolvconf/Makefile | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 1b50b86..2c3778d 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -7515,7 +7515,7 @@ smpphycontrol(struct cam_device *device, int argc, char **argv, response = malloc(sizeof(*response)); if (response == NULL) { warn("%s: unable to allocate %zd bytes", __func__, - sizeof(*request)); + sizeof(*response)); retval = 1; goto bailout; } diff --git a/sbin/hastd/lzf.h b/sbin/hastd/lzf.h index d9563ef..b1ad52e 100644 --- a/sbin/hastd/lzf.h +++ b/sbin/hastd/lzf.h @@ -132,7 +132,11 @@ lzf_decompress (const void *const in_data, unsigned int in_len, * Unconditionally aligning does not cost very much, so do it if unsure */ #ifndef STRICT_ALIGN -# define STRICT_ALIGN !(defined(__i386) || defined (__amd64)) +# if !(defined(__i386) || defined (__amd64)) +# define STRICT_ALIGN 1 +# else +# define STRICT_ALIGN 0 +# endif #endif /* diff --git a/sbin/resolvconf/Makefile b/sbin/resolvconf/Makefile index e831afa..355d72f 100644 --- a/sbin/resolvconf/Makefile +++ b/sbin/resolvconf/Makefile @@ -16,6 +16,7 @@ CLEANFILES= ${SCRIPTS} ${FILES} ${MAN} SYSCONFDIR= /etc RCDIR= ${SYSCONFDIR}/rc.d VARDIR= /var/run/resolvconf +SBINDIR= /sbin # We don't assume to restart the services in /sbin. So, though # our service(8) is in /usr/sbin, we can use it, here. @@ -28,13 +29,13 @@ RESTARTCMD= "/usr/sbin/service ${CMD1} \&\& /usr/sbin/service ${CMD2}" .for f in ${SCRIPTS} ${FILES} ${MAN} ${f}: ${f}.in - sed -e 's:@PREFIX@::g' \ - -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' \ + sed -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' \ -e 's:@LIBEXECDIR@:${FILESDIR}:g' \ -e 's:@VARDIR@:${VARDIR}:g' \ -e 's:@RESTARTCMD \(.*\)@:${RESTARTCMD_WITH_ARG}:g' \ -e 's:@RESTARTCMD@:${RESTARTCMD}:g' \ -e 's:@RCDIR@:${RCDIR}:g' \ + -e 's:@SBINDIR@:${SBINDIR}:g' \ -e 's: vpn : ng[0-9]*&:g' \ ${DIST}/$@.in > $@ .endfor |
