CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: mrg
Date: Tue Nov 6 06:17:29 UTC 2018
Modified Files:
src/external/gpl3/gcc/dist/gcc: ipa-inline.c
src/external/gpl3/gcc/usr.bin/backend: Makefile
Log Message:
- make the build depend upon the BASE-VER file.
- workaround a problem only see with -O2 in ipa-inline.c: it can't
convince itself that an integer underflow can't happen.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/gpl3/gcc/dist/gcc/ipa-inline.c
cvs rdiff -u -r1.50 -r1.51 src/external/gpl3/gcc/usr.bin/backend/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/ipa-inline.c
diff -u src/external/gpl3/gcc/dist/gcc/ipa-inline.c:1.1.1.5 src/external/gpl3/gcc/dist/gcc/ipa-inline.c:1.2
--- src/external/gpl3/gcc/dist/gcc/ipa-inline.c:1.1.1.5 Sun Nov 4 00:12:42 2018
+++ src/external/gpl3/gcc/dist/gcc/ipa-inline.c Tue Nov 6 06:17:29 2018
@@ -2435,7 +2435,11 @@ ipa_inline (void)
could remove other nodes with flatten attribute. See PR82801. */
struct cgraph_node_hook_list *node_removal_hook_holder = NULL;
hash_set *flatten_removed_nodes = NULL;
- if (j < nnodes - 2)
+ /*
+ * XXXMRG: added "nnodes > 1" as -O2 (but not -O) warn:
+ *"assuming signed overflow does not occur"
+ */
+ if (nnodes > 1 && j < nnodes - 2)
{
flatten_removed_nodes = new hash_set;
node_removal_hook_holder
Index: src/external/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.50 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.51
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.50 Sun Jul 15 00:59:49 2018
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile Tue Nov 6 06:17:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2018/07/15 00:59:49 christos Exp $
+# $NetBSD: Makefile,v 1.51 2018/11/06 06:17:29 mrg Exp $
LIBISPRIVATE= yes
@@ -18,6 +18,7 @@ CPPFLAGS+= ${BOTH_CPPFLAGS} -DTARGET_NAM
HOST_CPPFLAGS+= -I${HOST_LIBIBERTYOBJ}/libiberty
HOST_CPPFLAGS+= ${BOTH_CPPFLAGS} -DGENERATOR_FILE
DPSRCS+= insn-attr.h insn-codes.h insn-config.h insn-flags.h tree-check.h
+DPSRCS+= ${DIST}/gcc/BASE-VER
CPPFLAGS+= -I${DIST}/libgcc
CPPFLAGS+= -I${.CURDIR}/../../lib/libgcc/libgcov/arch/${MACHINE_ARCH}
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: plunky Date: Tue Nov 6 06:16:00 UTC 2018 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: add rc.d/dhcpd6 To generate a diff of this commit: cvs rdiff -u -r1.219 -r1.220 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/postinstall/postinstall diff -u src/usr.sbin/postinstall/postinstall:1.219 src/usr.sbin/postinstall/postinstall:1.220 --- src/usr.sbin/postinstall/postinstall:1.219 Fri Oct 26 18:06:34 2018 +++ src/usr.sbin/postinstall/postinstall Tue Nov 6 06:16:00 2018 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.219 2018/10/26 18:06:34 martin Exp $ +# $NetBSD: postinstall,v 1.220 2018/11/06 06:16:00 plunky Exp $ # # Copyright (c) 2002-2015 The NetBSD Foundation, Inc. # All rights reserved. @@ -1392,6 +1392,7 @@ cron devpubd dhcpcd dhcpd +dhcpd6 dhcrelay dmesg downinterfaces
CVS commit: src/sys/netinet6
Module Name:src
Committed By: ozaki-r
Date: Tue Nov 6 04:27:41 UTC 2018
Modified Files:
src/sys/netinet6: udp6_usrreq.c
Log Message:
Restore the length check of a sockaddr passed from userland at udp6_output
A sockaddr with invalid length could be passed to the network stack resulting in
a kernel panic like this:
panic: sockaddr_copy: source too long, 28 < 128 bytes
fatal breakpoint trap in supervisor mode
trap type 1 code 0 rip 0x80216c35 cs 0x8 rflags 0x246 cr2
0x7f7ff7ef3000 ilevel 0x4 rsp 0x80003308b690
curlwp 0xfe803e11ca40 pid 48.1 lowest kstack 0x8000330852c0
Stopped in pid 48.1 (a.out) at netbsd:breakpoint+0x5: leave
db{1}> bt
breakpoint() at netbsd:breakpoint+0x5
vpanic() at netbsd:vpanic+0x140
panic() at netbsd:panic+0x3c
sockaddr_copy() at netbsd:sockaddr_copy+0x95
rtcache_setdst() at netbsd:rtcache_setdst+0x73
rtcache_lookup2() at netbsd:rtcache_lookup2+0x56
in6_selectroute() at netbsd:in6_selectroute+0x184
in6_selectsrc() at netbsd:in6_selectsrc+0x119
udp6_output() at netbsd:udp6_output+0x25e
udp6_send_wrapper() at netbsd:udp6_send_wrapper+0x8a
sosend() at netbsd:sosend+0x7bf
do_sys_sendmsg_so() at netbsd:do_sys_sendmsg_so+0x28e
do_sys_sendmsg() at netbsd:do_sys_sendmsg+0x89
sys_sendto() at netbsd:sys_sendto+0x5c
syscall() at netbsd:syscall+0x1ed
--- syscall (number 133) ---
7f7ff790173a:
Reported by Paul Ripke
To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/sys/netinet6/udp6_usrreq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/udp6_usrreq.c
diff -u src/sys/netinet6/udp6_usrreq.c:1.142 src/sys/netinet6/udp6_usrreq.c:1.143
--- src/sys/netinet6/udp6_usrreq.c:1.142 Sun Nov 4 08:48:01 2018
+++ src/sys/netinet6/udp6_usrreq.c Tue Nov 6 04:27:41 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: udp6_usrreq.c,v 1.142 2018/11/04 08:48:01 mlelstv Exp $ */
+/* $NetBSD: udp6_usrreq.c,v 1.143 2018/11/06 04:27:41 ozaki-r Exp $ */
/* $KAME: udp6_usrreq.c,v 1.86 2001/05/27 17:33:00 itojun Exp $ */
/* $KAME: udp6_output.c,v 1.43 2001/10/15 09:19:52 itojun Exp $ */
@@ -63,7 +63,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.142 2018/11/04 08:48:01 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.143 2018/11/06 04:27:41 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -668,6 +668,10 @@ udp6_output(struct in6pcb * const in6p,
if (addr6) {
sin6 = addr6;
+ if (sin6->sin6_len != sizeof(*sin6)) {
+ error = EINVAL;
+ goto release;
+ }
if (sin6->sin6_family != AF_INET6) {
error = EAFNOSUPPORT;
goto release;
CVS commit: src/sbin/savecore
Module Name:src
Committed By: mrg
Date: Tue Nov 6 04:07:22 UTC 2018
Modified Files:
src/sbin/savecore: savecore.c
Log Message:
put a bunch of the kvm_read + warn on failure code into a macro that
describes more about what failed. now errors tell you which actual
variable was being requested instead of simply saying "not yours".
tested on amd64 as working. written for arm64 testing.
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sbin/savecore/savecore.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/savecore/savecore.c
diff -u src/sbin/savecore/savecore.c:1.86 src/sbin/savecore/savecore.c:1.87
--- src/sbin/savecore/savecore.c:1.86 Mon May 13 18:44:11 2013
+++ src/sbin/savecore/savecore.c Tue Nov 6 04:07:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: savecore.c,v 1.86 2013/05/13 18:44:11 christos Exp $ */
+/* $NetBSD: savecore.c,v 1.87 2018/11/06 04:07:22 mrg Exp $ */
/*-
* Copyright (c) 1986, 1992, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1986, 19
#if 0
static char sccsid[] = "@(#)savecore.c 8.5 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: savecore.c,v 1.86 2013/05/13 18:44:11 christos Exp $");
+__RCSID("$NetBSD: savecore.c,v 1.87 2018/11/06 04:07:22 mrg Exp $");
#endif
#endif /* not lint */
@@ -73,8 +73,20 @@ __RCSID("$NetBSD: savecore.c,v 1.86 2013
extern FILE *zopen(const char *fname, const char *mode);
+/*
+ * Note that KREAD_LOGWARN takes a variable name, not pointer to it, unlike
+ * KREAD() itself.
+ */
#define KREAD(kd, addr, p)\
(kvm_read(kd, addr, (char *)(p), sizeof(*(p))) != sizeof(*(p)))
+#define KREAD_LOGWARN(kd, addr, p, err) \
+do { \
+ if (KREAD(kd, addr, &(p)) != 0) {\
+ syslog(LOG_WARNING, "%s:%d: kvm_read " #p ": %s", \
+ __func__, __LINE__, kvm_geterr(kd)); \
+ err; \
+ }\
+} while (0)
static struct nlist current_nl[] = { /* Namelist for currently running system. */
#define X_DUMPDEV 0
@@ -259,6 +271,7 @@ main(int argc, char *argv[])
static void
kmem_setup(int verbose)
{
+ long l_dumplo;
kvm_t *kd_kern;
char errbuf[_POSIX2_LINE_MAX];
int i, hdrsz;
@@ -295,47 +308,30 @@ kmem_setup(int verbose)
}
}
- if (KREAD(kd_kern, current_nl[X_DUMPDEV].n_value, ) != 0) {
- syslog(LOG_WARNING, "kvm_read: %s", kvm_geterr(kd_kern));
- exit(1);
- }
+ KREAD_LOGWARN(kd_kern, current_nl[X_DUMPDEV].n_value, dumpdev, exit(1));
if (dumpdev == NODEV) {
syslog(LOG_WARNING, "no core dump (no dumpdev)");
exit(1);
}
- {
- long l_dumplo;
-
- if (KREAD(kd_kern, current_nl[X_DUMPLO].n_value, _dumplo) != 0) {
- syslog(LOG_WARNING, "kvm_read: %s", kvm_geterr(kd_kern));
- exit(1);
- }
- if (l_dumplo == -1) {
+ KREAD_LOGWARN(kd_kern, current_nl[X_DUMPLO].n_value, l_dumplo, exit(1));
+ if (l_dumplo == -1) {
syslog(LOG_WARNING, "no core dump (invalid dumplo)");
exit(1);
- }
- dumplo = DEV_BSIZE * (off_t) l_dumplo;
}
+ dumplo = DEV_BSIZE * (off_t) l_dumplo;
if (verbose)
(void)printf("dumplo = %lld (%ld * %ld)\n",
(long long)dumplo, (long)(dumplo / DEV_BSIZE), (long)DEV_BSIZE);
- if (KREAD(kd_kern, current_nl[X_DUMPMAG].n_value, ) != 0) {
- syslog(LOG_WARNING, "kvm_read: %s", kvm_geterr(kd_kern));
- exit(1);
- }
+ KREAD_LOGWARN(kd_kern, current_nl[X_DUMPMAG].n_value, dumpmag, exit(1));
(void)kvm_read(kd_kern, current_nl[X_VERSION].n_value, vers,
sizeof(vers));
vers[sizeof(vers) - 1] = '\0';
if (current_nl[X_DUMPCDEV].n_value != 0) {
- if (KREAD(kd_kern, current_nl[X_DUMPCDEV].n_value,
- ) != 0) {
- syslog(LOG_WARNING, "kvm_read: %s",
- kvm_geterr(kd_kern));
- exit(1);
- }
+ KREAD_LOGWARN(kd_kern, current_nl[X_DUMPCDEV].n_value, dumpcdev,
+ exit(1));
ddname = find_dev(dumpcdev, S_IFCHR);
} else
ddname = find_dev(dumpdev, S_IFBLK);
@@ -403,27 +399,20 @@ check_kmem(void)
kvm_getkernelname(kd_dump), vers, core_vers);
panicstart = panicend = 0;
- if (KREAD(kd_dump, dump_nl[X_PANICSTART].n_value, ) != 0) {
- syslog(LOG_WARNING, "kvm_read: %s", kvm_geterr(kd_dump));
- goto nomsguf;
- }
- if (KREAD(kd_dump, dump_nl[X_PANICEND].n_value, ) != 0) {
- syslog(LOG_WARNING, "kvm_read: %s", kvm_geterr(kd_dump));
- goto nomsguf;
- }
+ KREAD_LOGWARN(kd_dump, dump_nl[X_PANICSTART].n_value, panicstart,
+ goto nomsguf);
+ KREAD_LOGWARN(kd_dump, dump_nl[X_PANICEND].n_value, panicend,
+ goto nomsguf);
+
if (panicstart != 0 && panicend != 0) {
- if (KREAD(kd_dump, dump_nl[X_MSGBUF].n_value, )) {
- syslog(LOG_WARNING, "kvm_read: %s", kvm_geterr(kd_dump));
- goto nomsguf;
- }
- if (kvm_read(kd_dump, (long)bufp, ,
- offsetof(struct kern_msgbuf, msg_bufc)) !=
- offsetof(struct kern_msgbuf, msg_bufc)) {
- syslog(LOG_WARNING, "kvm_read: %s", kvm_geterr(kd_dump));
- goto nomsguf;
- }
+ KREAD_LOGWARN(kd_dump, dump_nl[X_MSGBUF].n_value, bufp,
+ goto nomsguf);
+
CVS commit: src
Module Name:src
Committed By: mrg
Date: Tue Nov 6 04:04:34 UTC 2018
Modified Files:
src/common/lib/libutil: getfstypename.c
src/sbin/gpt: gpt_uuid.c
src/sys/dev/dkwedge: dkwedge_gpt.c
src/sys/sys: disk.h disklabel.h disklabel_gpt.h
Log Message:
add support to detect the 3 vmware GPT partition types:
- VMKcore (dump partition)
- VMFS
- VMware reserved
this enables vmkcore partitions for netbsd swap or dump, as well
as naming all of them.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/common/lib/libutil/getfstypename.c
cvs rdiff -u -r1.15 -r1.16 src/sbin/gpt/gpt_uuid.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/dkwedge/dkwedge_gpt.c
cvs rdiff -u -r1.72 -r1.73 src/sys/sys/disk.h
cvs rdiff -u -r1.119 -r1.120 src/sys/sys/disklabel.h
cvs rdiff -u -r1.12 -r1.13 src/sys/sys/disklabel_gpt.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libutil/getfstypename.c
diff -u src/common/lib/libutil/getfstypename.c:1.8 src/common/lib/libutil/getfstypename.c:1.9
--- src/common/lib/libutil/getfstypename.c:1.8 Sat Apr 7 16:28:59 2012
+++ src/common/lib/libutil/getfstypename.c Tue Nov 6 04:04:33 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: getfstypename.c,v 1.8 2012/04/07 16:28:59 christos Exp $ */
+/* $NetBSD: getfstypename.c,v 1.9 2018/11/06 04:04:33 mrg Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -39,10 +39,10 @@
# include
# ifndef _KERNEL
# if !defined(lint)
-__RCSID("$NetBSD: getfstypename.c,v 1.8 2012/04/07 16:28:59 christos Exp $");
+__RCSID("$NetBSD: getfstypename.c,v 1.9 2018/11/06 04:04:33 mrg Exp $");
# endif
# else
-__KERNEL_RCSID(0, "$NetBSD: getfstypename.c,v 1.8 2012/04/07 16:28:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: getfstypename.c,v 1.9 2018/11/06 04:04:33 mrg Exp $");
# endif /* _KERNEL */
# define FSTYPE_ENUMNAME fstype_enum
@@ -123,6 +123,12 @@ getfstypename(int fstype)
return DKW_PTYPE_UNKNOWN;
case FS_MINIXFS3:
return DKW_PTYPE_MINIXFS3;
+ case FS_VMKCORE:
+ return DKW_PTYPE_VMKCORE;
+ case FS_VMFS:
+ return DKW_PTYPE_VMFS;
+ case FS_VMWRESV:
+ return DKW_PTYPE_VMWRESV;
}
/* Stupid gcc, should know it is impossible to get here */
/*NOTREACHED*/
Index: src/sbin/gpt/gpt_uuid.c
diff -u src/sbin/gpt/gpt_uuid.c:1.15 src/sbin/gpt/gpt_uuid.c:1.16
--- src/sbin/gpt/gpt_uuid.c:1.15 Thu Feb 16 22:40:19 2017
+++ src/sbin/gpt/gpt_uuid.c Tue Nov 6 04:04:33 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: gpt_uuid.c,v 1.15 2017/02/16 22:40:19 christos Exp $ */
+/* $NetBSD: gpt_uuid.c,v 1.16 2018/11/06 04:04:33 mrg Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include
#ifdef __RCSID
-__RCSID("$NetBSD: gpt_uuid.c,v 1.15 2017/02/16 22:40:19 christos Exp $");
+__RCSID("$NetBSD: gpt_uuid.c,v 1.16 2018/11/06 04:04:33 mrg Exp $");
#endif
#include
@@ -87,6 +87,9 @@ static const struct {
{ GPT_ENT_TYPE_NETBSD_RAIDFRAME, "raid",
"NetBSD RAIDFrame component" },
{ GPT_ENT_TYPE_NETBSD_SWAP, "swap", "NetBSD swap" },
+ { GPT_ENT_TYPE_VMWARE_VMKCORE, "swap", "VMware VMkernel core dump" },
+ { GPT_ENT_TYPE_VMWARE_VMFS, "swap", "VMware VMFS" },
+ { GPT_ENT_TYPE_VMWARE_RESERVED, "swap", "VMware reserved" },
};
static void
Index: src/sys/dev/dkwedge/dkwedge_gpt.c
diff -u src/sys/dev/dkwedge/dkwedge_gpt.c:1.20 src/sys/dev/dkwedge/dkwedge_gpt.c:1.21
--- src/sys/dev/dkwedge/dkwedge_gpt.c:1.20 Thu Sep 7 10:18:26 2017
+++ src/sys/dev/dkwedge/dkwedge_gpt.c Tue Nov 6 04:04:33 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dkwedge_gpt.c,v 1.20 2017/09/07 10:18:26 christos Exp $ */
+/* $NetBSD: dkwedge_gpt.c,v 1.21 2018/11/06 04:04:33 mrg Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dkwedge_gpt.c,v 1.20 2017/09/07 10:18:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dkwedge_gpt.c,v 1.21 2018/11/06 04:04:33 mrg Exp $");
#include
#include
@@ -73,6 +73,9 @@ static const struct {
{ GPT_ENT_TYPE_NETBSD_CCD, DKW_PTYPE_CCD },
{ GPT_ENT_TYPE_NETBSD_CGD, DKW_PTYPE_CGD },
{ GPT_ENT_TYPE_APPLE_HFS, DKW_PTYPE_APPLEHFS },
+ { GPT_ENT_TYPE_VMWARE_VMKCORE, DKW_PTYPE_VMKCORE },
+ { GPT_ENT_TYPE_VMWARE_VMFS, DKW_PTYPE_VMFS },
+ { GPT_ENT_TYPE_VMWARE_RESERVED, DKW_PTYPE_VMWRESV },
};
static const char *
Index: src/sys/sys/disk.h
diff -u src/sys/sys/disk.h:1.72 src/sys/sys/disk.h:1.73
--- src/sys/sys/disk.h:1.72 Tue Jun 13 14:05:47 2017
+++ src/sys/sys/disk.h Tue Nov 6 04:04:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: disk.h,v 1.72 2017/06/13 14:05:47 chs Exp $ */
+/* $NetBSD: disk.h,v 1.73 2018/11/06 04:04:34 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997, 2004 The NetBSD Foundation, Inc.
@@ -208,6 +208,9 @@ struct dkwedge_list {
#define DKW_PTYPE_NILFS "nilfs"
#define DKW_PTYPE_CGD "cgd"
#define DKW_PTYPE_MINIXFS3 "minixfs3"
+#define DKW_PTYPE_VMKCORE "vmkcore"
+#define DKW_PTYPE_VMFS
CVS commit: src/sys/fs/puffs
Module Name:src
Committed By: manu
Date: Tue Nov 6 02:39:49 UTC 2018
Modified Files:
src/sys/fs/puffs: puffs_vnops.c
Log Message:
Fix use after RECLAIM in PUFFS filesystems
>From hannken@
When puffs_cookie2vnode() misses an entry and vrele() it operations
puffs_vnop_reclaim() and puffs_vnop_fsync() get called with a VNON
vnode.
Do not notify the server in this case as the cookie is stale.
To generate a diff of this commit:
cvs rdiff -u -r1.212 -r1.213 src/sys/fs/puffs/puffs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/puffs/puffs_vnops.c
diff -u src/sys/fs/puffs/puffs_vnops.c:1.212 src/sys/fs/puffs/puffs_vnops.c:1.213
--- src/sys/fs/puffs/puffs_vnops.c:1.212 Mon Nov 5 02:28:32 2018
+++ src/sys/fs/puffs/puffs_vnops.c Tue Nov 6 02:39:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_vnops.c,v 1.212 2018/11/05 02:28:32 manu Exp $ */
+/* $NetBSD: puffs_vnops.c,v 1.213 2018/11/06 02:39:49 manu Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.212 2018/11/05 02:28:32 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.213 2018/11/06 02:39:49 manu Exp $");
#include
#include
@@ -1470,6 +1470,10 @@ puffs_vnop_reclaim(void *v)
notifyserver = false;
}
+ /* See the comment on top of puffs_vnop_inactive(). */
+ if (vp->v_type == VNON)
+ notifyserver = false;
+
/*
* purge info from kernel before issueing FAF, since we
* don't really know when we'll get around to it after
@@ -1723,6 +1727,11 @@ puffs_vnop_fsync(void *v)
pn = VPTOPP(vp);
KASSERT(pn != NULL);
pmp = MPTOPUFFSMP(vp->v_mount);
+
+ /* See the comment on top of puffs_vnop_inactive(). */
+ if (vp->v_type == VNON)
+ return 0;
+
if (ap->a_flags & FSYNC_WAIT) {
mutex_enter(>pn_sizemtx);
} else {
CVS commit: src/etc/etc.evbarm
Module Name:src
Committed By: skrll
Date: Mon Nov 5 21:34:33 UTC 2018
Modified Files:
src/etc/etc.evbarm: Makefile.inc
Log Message:
Match the right MACHINE_ARCHes for GENERIC.
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/etc/etc.evbarm/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.98 src/etc/etc.evbarm/Makefile.inc:1.99
--- src/etc/etc.evbarm/Makefile.inc:1.98 Sun Nov 4 21:41:12 2018
+++ src/etc/etc.evbarm/Makefile.inc Mon Nov 5 21:34:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.98 2018/11/04 21:41:12 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.99 2018/11/05 21:34:33 skrll Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -175,7 +175,7 @@ BUILD_KERNELS+= ${board}_INSTALL
KERNEL_SETS+= ${KERNEL_SETS.${arch}}
.endfor
-.if !empty(MACHINE_ARCH:M*earmv[67])
+.if !empty(MACHINE_ARCH:Mearmv7*)
KERNEL_SETS+= GENERIC
.endif
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Mon Nov 5 19:45:57 UTC 2018
Modified Files:
src/usr.sbin/sysinst: disks.c
src/usr.sbin/sysinst/arch/amd64: md.h
src/usr.sbin/sysinst/arch/amiga: md.h
src/usr.sbin/sysinst/arch/emips: md.h
src/usr.sbin/sysinst/arch/hp300: md.h
src/usr.sbin/sysinst/arch/i386: md.h
src/usr.sbin/sysinst/arch/sparc: md.h
src/usr.sbin/sysinst/arch/vax: md.h
Log Message:
Get rid of hard coded disk names and use sysctl hw.disknames
instead.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/sysinst/disks.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/amd64/md.h
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/amiga/md.h
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/emips/md.h
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/hp300/md.h
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/i386/md.h
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/sparc/md.h
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/vax/md.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/disks.c
diff -u src/usr.sbin/sysinst/disks.c:1.16 src/usr.sbin/sysinst/disks.c:1.17
--- src/usr.sbin/sysinst/disks.c:1.16 Sun Jun 3 13:18:06 2018
+++ src/usr.sbin/sysinst/disks.c Mon Nov 5 19:45:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.16 2018/06/03 13:18:06 martin Exp $ */
+/* $NetBSD: disks.c,v 1.17 2018/11/05 19:45:56 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -36,6 +36,7 @@
#include
+#include
#include
#include
#include
@@ -109,12 +110,6 @@ static void fixsb(const char *, const ch
static bool is_gpt(const char *);
static int incoregpt(pm_devs_t *, partinfo *);
-#ifndef DISK_NAMES
-#define DISK_NAMES "wd", "sd", "ld", "raid"
-#endif
-
-static const char *disk_names[] = { DISK_NAMES,
-"vnd", "cgd", "dk:no_part", NULL };
static bool tmpfs_on_var_shm(void);
@@ -510,72 +505,86 @@ is_ffs_wedge(const char *dev)
static int
get_disks(struct disk_desc *dd, bool with_non_partitionable)
{
- const char **xd;
- char *cp;
+ static const int mib[] = { CTL_HW, HW_DISKNAMES };
+ static const unsigned int miblen = __arraycount(mib);
+ const char *xd;
struct disklabel l;
- int i;
int numdisks;
+ size_t len;
+ char *disk_names;
/* initialize */
numdisks = 0;
- for (xd = disk_names; *xd != NULL; xd++) {
- for (i = 0; i < MAX_DISKS; i++) {
- strlcpy(dd->dd_name, *xd, sizeof dd->dd_name - 2);
- cp = strchr(dd->dd_name, ':');
- if (cp != NULL) {
-dd->dd_no_mbr = !strcmp(cp, ":no_mbr");
-dd->dd_no_part = !strcmp(cp, ":no_part");
- } else {
-dd->dd_no_mbr = false;
-dd->dd_no_part = false;
-cp = strchr(dd->dd_name, 0);
- }
- if (dd->dd_no_part && !with_non_partitionable)
-continue;
+ if (sysctl(mib, miblen, NULL, , NULL, 0) == -1)
+ return 0;
+ disk_names = malloc(len);
+ if (disk_names == NULL)
+ return 0;
- snprintf(cp, 2 + 1, "%d", i);
- if (!get_geom(dd->dd_name, )) {
-if (errno == ENOENT)
- break;
-if (errno != ENOTTY || !dd->dd_no_part)
- /*
- * Allow plain partitions,
- * like already existing wedges
- * (like dk0) if marked as
- * non-partitioning device.
- * For all other cases, continue
- * with the next disk.
- */
- continue;
-if (!is_ffs_wedge(dd->dd_name))
- continue;
- }
+ if (sysctl(mib, miblen, disk_names, , NULL, 0) == -1) {
+ free(disk_names);
+ return 0;
+ }
- /*
- * Exclude a disk mounted as root partition,
- * in case of install-image on a USB memstick.
- */
- if (is_active_rootpart(dd->dd_name, 0))
+ for (xd = strtok(disk_names, " "); xd != NULL; xd = strtok(NULL, " ")) {
+ strlcpy(dd->dd_name, xd, sizeof dd->dd_name - 2);
+ dd->dd_no_mbr = false;
+ dd->dd_no_part = false;
+
+ if (strncmp(xd, "dk", 2) == 0) {
+ char *endp;
+ int e;
+
+ /* if this device is dk, no partitioning is possible */
+ strtou(xd+2, , 10, 0, INT_MAX, );
+ if (endp && *endp == 0 && e == 0)
+dd->dd_no_part = true;
+ }
+ if (dd->dd_no_part && !with_non_partitionable)
+ continue;
+
+ if (!get_geom(dd->dd_name, )) {
+ if (errno == ENOENT)
+break;
+ if (errno != ENOTTY || !dd->dd_no_part)
+/*
+ * Allow plain partitions,
+ * like already existing wedges
+ * (like dk0) if marked as
+ * non-partitioning device.
+ * For all other cases, continue
+ * with the next disk.
+ */
+continue;
+ if (!is_ffs_wedge(dd->dd_name))
continue;
+ }
- if (!dd->dd_no_part) {
-dd->dd_cyl = l.d_ncylinders;
-dd->dd_head = l.d_ntracks;
-dd->dd_sec = l.d_nsectors;
-dd->dd_secsize = l.d_secsize;
-dd->dd_totsec = l.d_secperunit;
- }
- if (dd->dd_no_part)
-get_wedge_descr(dd);
- else
-get_descr(dd);
- dd++;
- numdisks++;
- if
CVS commit: src/sys/dev/ppbus
Module Name:src
Committed By: mlelstv
Date: Mon Nov 5 18:37:18 UTC 2018
Modified Files:
src/sys/dev/ppbus: if_plip.c
Log Message:
When refactoring interface drivers after netbsd-4, the SIOCINITIFADDR
ioctl was passed through ifioctl_common, because the case falls through
to the SIOCSIFFLAGS case. The common handler however doesn't implement
SIOCINITIFADDR, so an attempt to configure plip always failed with ENOTTY.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/ppbus/if_plip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ppbus/if_plip.c
diff -u src/sys/dev/ppbus/if_plip.c:1.31 src/sys/dev/ppbus/if_plip.c:1.32
--- src/sys/dev/ppbus/if_plip.c:1.31 Wed Jul 25 07:55:45 2018
+++ src/sys/dev/ppbus/if_plip.c Mon Nov 5 18:37:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_plip.c,v 1.31 2018/07/25 07:55:45 msaitoh Exp $ */
+/* $NetBSD: if_plip.c,v 1.32 2018/11/05 18:37:18 mlelstv Exp $ */
/*-
* Copyright (c) 1997 Poul-Henning Kamp
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.31 2018/07/25 07:55:45 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.32 2018/11/05 18:37:18 mlelstv Exp $");
/*
* Parallel port TCP/IP interfaces added. I looked at the driver from
@@ -375,8 +375,10 @@ lpioctl(struct ifnet *ifp, u_long cmd, v
ifp->if_flags |= IFF_UP;
/* FALLTHROUGH */
case SIOCSIFFLAGS:
- if ((error = ifioctl_common(ifp, cmd, data)) != 0)
- break;
+ if (cmd == SIOCSIFFLAGS) {
+ if ((error = ifioctl_common(ifp, cmd, data)) != 0)
+break;
+ }
if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) == IFF_UP) {
if ((error = ppbus_request_bus(ppbus, dev, 0, 0)))
break;
CVS commit: src/external/bsd/top/dist
Module Name:src Committed By: maya Date: Mon Nov 5 17:44:09 UTC 2018 Modified Files: src/external/bsd/top/dist: top.1.in Log Message: Fix typo s/fron/from/ >From dfive on freenode, thanks! To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/bsd/top/dist/top.1.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/top/dist/top.1.in diff -u src/external/bsd/top/dist/top.1.in:1.11 src/external/bsd/top/dist/top.1.in:1.12 --- src/external/bsd/top/dist/top.1.in:1.11 Sun Aug 26 21:31:34 2018 +++ src/external/bsd/top/dist/top.1.in Mon Nov 5 17:44:09 2018 @@ -4,7 +4,7 @@ .nr D @DEFAULT_DELAY@ .nr L @HAVE_GETOPT_LONG@ .nr K @ENABLE_KILL@ -.TH TOP 1 "August 26, 2018" +.TH TOP 1 "November 5, 2018" .UC 4 .SH NAME top \- display and update information about the top cpu processes @@ -294,7 +294,7 @@ Change the number of processes to displa .TP .B o Change the order in which the display is sorted. This command is not -available on all systems. The sort key names vary fron system to system +available on all systems. The sort key names vary from system to system but usually include: \*(lqcpu\*(rq, \*(lqres\*(rq, \*(lqsize\*(rq, \*(lqtime\*(rq. The default is cpu. .TP
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Mon Nov 5 17:04:03 UTC 2018
Modified Files:
src/usr.sbin/sysinst: util.c
Log Message:
For "unknown" sets (should only happen for pkgsrc.tgz), always use
.tgz suffix.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/util.c
diff -u src/usr.sbin/sysinst/util.c:1.12 src/usr.sbin/sysinst/util.c:1.13
--- src/usr.sbin/sysinst/util.c:1.12 Sat Oct 6 18:45:37 2018
+++ src/usr.sbin/sysinst/util.c Mon Nov 5 17:04:03 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.12 2018/10/06 18:45:37 martin Exp $ */
+/* $NetBSD: util.c,v 1.13 2018/11/05 17:04:03 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1757,11 +1757,12 @@ use_tgz_for_set(const char *set_name)
return dist->force_tgz;
}
- return false;
+ return true;
}
/* Return the postfix used for a given set */
-const char *set_postfix(const char *set_name)
+const char *
+set_postfix(const char *set_name)
{
return use_tgz_for_set(set_name) ? dist_tgz_postfix : dist_postfix;
}
CVS commit: src/sys/arch/arm/cortex
Module Name:src
Committed By: jmcneill
Date: Mon Nov 5 11:50:15 UTC 2018
Modified Files:
src/sys/arch/arm/cortex: gicv3.c
Log Message:
ICC_PMR_EL1 has different encoding than IPRIORITYR. Not 100% sure that this is
correct yet, but it works with both RK3399 and QEMU.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/cortex/gicv3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/cortex/gicv3.c
diff -u src/sys/arch/arm/cortex/gicv3.c:1.3 src/sys/arch/arm/cortex/gicv3.c:1.4
--- src/sys/arch/arm/cortex/gicv3.c:1.3 Sun Sep 30 13:53:26 2018
+++ src/sys/arch/arm/cortex/gicv3.c Mon Nov 5 11:50:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3.c,v 1.3 2018/09/30 13:53:26 jmcneill Exp $ */
+/* $NetBSD: gicv3.c,v 1.4 2018/11/05 11:50:15 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -31,7 +31,7 @@
#define _INTR_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.3 2018/09/30 13:53:26 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.4 2018/11/05 11:50:15 jmcneill Exp $");
#include
#include
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.
#define PICTOSOFTC(pic) \
((void *)((uintptr_t)(pic) - offsetof(struct gicv3_softc, sc_pic)))
-#define IPL_TO_PRIORITY(ipl) (0x80 | ((IPL_HIGH - (ipl)) << 4))
+#define IPL_TO_PRIORITY(ipl) ((IPL_HIGH - (ipl)) << 4)
static struct gicv3_softc *gicv3_softc;
@@ -147,7 +147,7 @@ gicv3_establish_irq(struct pic_softc *pi
uint64_t irouter;
u_int n;
- const u_int ipriority_val = IPL_TO_PRIORITY(is->is_ipl);
+ const u_int ipriority_val = 0x80 | IPL_TO_PRIORITY(is->is_ipl);
const u_int ipriority_shift = (is->is_irq & 0x3) * 8;
const u_int icfg_shift = (is->is_irq & 0xf) * 2;
@@ -198,7 +198,7 @@ gicv3_establish_irq(struct pic_softc *pi
static void
gicv3_set_priority(struct pic_softc *pic, int ipl)
{
- icc_pmr_write(IPL_TO_PRIORITY(ipl));
+ icc_pmr_write(IPL_TO_PRIORITY(ipl) << 1);
}
static void
@@ -389,7 +389,7 @@ gicv3_cpu_init(struct pic_softc *pic, st
;
/* Set initial priority mask */
- icc_pmr_write(IPL_TO_PRIORITY(IPL_HIGH));
+ gicv3_set_priority(pic, IPL_HIGH);
/* Disable preemption */
const uint32_t icc_bpr = __SHIFTIN(0x7, ICC_BPR_EL1_BinaryPoint);
CVS commit: src/usr.sbin/syslogd
Module Name:src
Committed By: martin
Date: Mon Nov 5 10:27:06 UTC 2018
Modified Files:
src/usr.sbin/syslogd: syslogd.c
Log Message:
Revert previous - local merge mishap
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/usr.sbin/syslogd/syslogd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/syslogd/syslogd.c
diff -u src/usr.sbin/syslogd/syslogd.c:1.129 src/usr.sbin/syslogd/syslogd.c:1.130
--- src/usr.sbin/syslogd/syslogd.c:1.129 Mon Nov 5 09:22:30 2018
+++ src/usr.sbin/syslogd/syslogd.c Mon Nov 5 10:27:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: syslogd.c,v 1.129 2018/11/05 09:22:30 wiz Exp $ */
+/* $NetBSD: syslogd.c,v 1.130 2018/11/05 10:27:06 martin Exp $ */
/*
* Copyright (c) 1983, 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
#else
-__RCSID("$NetBSD: syslogd.c,v 1.129 2018/11/05 09:22:30 wiz Exp $");
+__RCSID("$NetBSD: syslogd.c,v 1.130 2018/11/05 10:27:06 martin Exp $");
#endif
#endif /* not lint */
@@ -75,9 +75,6 @@ __RCSID("$NetBSD: syslogd.c,v 1.129 2018
#include "syslogd.h"
#include "extern.h"
-/* Minimum size of the logpath socket buffer */
-#define RCVBUFLEN 16384
-
#ifndef DISABLE_SIGN
#include "sign.h"
struct sign_global_t GlobalSign = {
@@ -496,9 +493,6 @@ getgroup:
die(0, 0, NULL);
}
for (j = 0, pp = LogPaths; *pp; pp++, j++) {
- int buf_len;
- socklen_t socklen = sizeof(buf_len);
-
DPRINTF(D_NET, "Making unix dgram socket `%s'\n", *pp);
unlink(*pp);
memset(, 0, sizeof(sunx));
@@ -513,19 +507,6 @@ getgroup:
}
setsockbuf(funix[j], *pp);
DPRINTF(D_NET, "Listening on unix dgram socket `%s'\n", *pp);
- if (getsockopt(funix[j], SOL_SOCKET, SO_RCVBUF,
- _len, ) == -1) {
- logerror("getsockopt: SO_RCVBUF: `%s'", *pp);
- continue;
- }
- if (buf_len >= RCVBUFLEN)
- continue;
- buf_len = RCVBUFLEN;
- if (setsockopt(funix[j], SOL_SOCKET, SO_RCVBUF,
- _len, socklen) == -1) {
- logerror("setsockopt: SO_RCVBUF: `%s'", *pp);
- continue;
- }
}
if ((fklog = open(_PATH_KLOG, O_RDONLY, 0)) < 0) {
CVS commit: src/usr.sbin/syslogd
Module Name:src
Committed By: wiz
Date: Mon Nov 5 09:22:30 UTC 2018
Modified Files:
src/usr.sbin/syslogd: syslogd.8 syslogd.c
Log Message:
Sort options.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/usr.sbin/syslogd/syslogd.8
cvs rdiff -u -r1.128 -r1.129 src/usr.sbin/syslogd/syslogd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/syslogd/syslogd.8
diff -u src/usr.sbin/syslogd/syslogd.8:1.57 src/usr.sbin/syslogd/syslogd.8:1.58
--- src/usr.sbin/syslogd/syslogd.8:1.57 Sun Nov 4 20:45:21 2018
+++ src/usr.sbin/syslogd/syslogd.8 Mon Nov 5 09:22:30 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: syslogd.8,v 1.57 2018/11/04 20:45:21 roy Exp $
+.\" $NetBSD: syslogd.8,v 1.58 2018/11/05 09:22:30 wiz Exp $
.\"
.\" Copyright (c) 1983, 1986, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -38,8 +38,8 @@
.Sh SYNOPSIS
.Nm
.Op Fl dnrSsTUvX
-.Op Fl b Ar bind_address
.Op Fl B Ar buffer_length
+.Op Fl b Ar bind_address
.Op Fl f Ar config_file
.Op Fl g Ar group
.Op Fl m Ar mark_interval
@@ -57,10 +57,6 @@ reads and logs messages to the system co
machines and/or users as specified by its configuration file.
The options are as follows:
.Bl -tag -width 15n
-.It Fl b Ar bind_address
-Specify one specific IP address or hostname to bind to.
-If a hostname is specified, the IPv4 or IPv6 address
-which corresponds to it is used.
.It Fl B Ar buffer_length
Sets the receiving buffer length.
The default is 16384 bytes.
@@ -68,6 +64,10 @@ If syslogd reports buffer overflow, this
If you don't care about it being reported, see the
.Fl X
option.
+.It Fl b Ar bind_address
+Specify one specific IP address or hostname to bind to.
+If a hostname is specified, the IPv4 or IPv6 address
+which corresponds to it is used.
.It Fl d
Enable debugging to the standard output,
and do not disassociate from the controlling terminal.
@@ -126,20 +126,16 @@ which
runs is subject to attack over the network and it is desired
that the machine be protected from attempts to remotely fill logs
and similar attacks.
-.It Fl t Ar chroot_dir
-.Xr chroot 2
-to
-.Ar chroot_dir
-after the sockets and log files have been opened.
.It Fl T
Always use the local time and date for messages received from the
network, instead of the timestamp field supplied in the message
by the remote host.
This is useful if some of the originating hosts can't keep time
properly or are unable to generate a correct timestamp.
-.It Fl u Ar user
-Set UID to
-.Ar user
+.It Fl t Ar chroot_dir
+.Xr chroot 2
+to
+.Ar chroot_dir
after the sockets and log files have been opened.
.It Fl U
Unique priority logging.
@@ -151,6 +147,10 @@ This option changes the default priority
.Sq >=
to
.Sq = .
+.It Fl u Ar user
+Set UID to
+.Ar user
+after the sockets and log files have been opened.
.It Fl v
Verbose logging.
If specified once, the numeric facility and priority are logged with
Index: src/usr.sbin/syslogd/syslogd.c
diff -u src/usr.sbin/syslogd/syslogd.c:1.128 src/usr.sbin/syslogd/syslogd.c:1.129
--- src/usr.sbin/syslogd/syslogd.c:1.128 Mon Nov 5 08:34:20 2018
+++ src/usr.sbin/syslogd/syslogd.c Mon Nov 5 09:22:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: syslogd.c,v 1.128 2018/11/05 08:34:20 martin Exp $ */
+/* $NetBSD: syslogd.c,v 1.129 2018/11/05 09:22:30 wiz Exp $ */
/*
* Copyright (c) 1983, 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
#else
-__RCSID("$NetBSD: syslogd.c,v 1.128 2018/11/05 08:34:20 martin Exp $");
+__RCSID("$NetBSD: syslogd.c,v 1.129 2018/11/05 09:22:30 wiz Exp $");
#endif
#endif /* not lint */
@@ -686,7 +686,7 @@ usage(void)
{
(void)fprintf(stderr,
- "usage: %s [-dnrSsTUvX] [-b bind_address] [-B buffer_length]\n"
+ "usage: %s [-dnrSsTUvX] [-B buffer_length] [-b bind_address]\n"
"\t[-f config_file] [-g group]\n"
"\t[-m mark_interval] [-P file_list] [-p log_socket\n"
"\t[-p log_socket2 ...]] [-t chroot_dir] [-u user]\n",
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Mon Nov 5 09:18:55 UTC 2018 Modified Files: src/lib/libc/sys: getsockopt.2 Log Message: Fix xref. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/lib/libc/sys/getsockopt.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/getsockopt.2 diff -u src/lib/libc/sys/getsockopt.2:1.38 src/lib/libc/sys/getsockopt.2:1.39 --- src/lib/libc/sys/getsockopt.2:1.38 Sun Nov 4 16:30:28 2018 +++ src/lib/libc/sys/getsockopt.2 Mon Nov 5 09:18:55 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: getsockopt.2,v 1.38 2018/11/04 16:30:28 christos Exp $ +.\" $NetBSD: getsockopt.2,v 1.39 2018/11/05 09:18:55 wiz Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -224,7 +224,7 @@ this behavior is not the default, but th setting the .Dv SO_RERROR flag using -.Xr sysctl 1 +.Xr sysctl 8 and .Dv kern.sooptions . .Pp
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3
Module Name:src
Committed By: mrg
Date: Mon Nov 5 08:45:32 UTC 2018
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile
Log Message:
GCC 6.5 ios_failure.cc needs to be compiled with cxx mode.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.33 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.34
--- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.33 Sat Apr 7 22:17:52 2018
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile Mon Nov 5 08:45:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2018/04/07 22:17:52 mrg Exp $
+# $NetBSD: Makefile,v 1.34 2018/11/05 08:45:32 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -154,7 +154,8 @@ CXX11_ALWAYS= localename.cc \
compatibility-atomic-c++0x.cc \
compatibility-thread-c++0x.cc \
compatibility-chrono.cc \
- compatibility-condvar.cc
+ compatibility-condvar.cc \
+ ios_failure.cc
.for _s in ${SRCS:M*.cc}
. if empty(COPTS.${_s}:M-std=*)
COPTS.${_s}+= -std=gnu++98
CVS commit: src/usr.sbin/syslogd
Module Name:src
Committed By: martin
Date: Mon Nov 5 08:34:20 UTC 2018
Modified Files:
src/usr.sbin/syslogd: syslogd.c
Log Message:
Make it compilable with gcc
To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/usr.sbin/syslogd/syslogd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/syslogd/syslogd.c
diff -u src/usr.sbin/syslogd/syslogd.c:1.127 src/usr.sbin/syslogd/syslogd.c:1.128
--- src/usr.sbin/syslogd/syslogd.c:1.127 Sun Nov 4 20:45:21 2018
+++ src/usr.sbin/syslogd/syslogd.c Mon Nov 5 08:34:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: syslogd.c,v 1.127 2018/11/04 20:45:21 roy Exp $ */
+/* $NetBSD: syslogd.c,v 1.128 2018/11/05 08:34:20 martin Exp $ */
/*
* Copyright (c) 1983, 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
#else
-__RCSID("$NetBSD: syslogd.c,v 1.127 2018/11/04 20:45:21 roy Exp $");
+__RCSID("$NetBSD: syslogd.c,v 1.128 2018/11/05 08:34:20 martin Exp $");
#endif
#endif /* not lint */
@@ -75,6 +75,9 @@ __RCSID("$NetBSD: syslogd.c,v 1.127 2018
#include "syslogd.h"
#include "extern.h"
+/* Minimum size of the logpath socket buffer */
+#define RCVBUFLEN 16384
+
#ifndef DISABLE_SIGN
#include "sign.h"
struct sign_global_t GlobalSign = {
@@ -493,6 +496,9 @@ getgroup:
die(0, 0, NULL);
}
for (j = 0, pp = LogPaths; *pp; pp++, j++) {
+ int buf_len;
+ socklen_t socklen = sizeof(buf_len);
+
DPRINTF(D_NET, "Making unix dgram socket `%s'\n", *pp);
unlink(*pp);
memset(, 0, sizeof(sunx));
@@ -507,6 +513,19 @@ getgroup:
}
setsockbuf(funix[j], *pp);
DPRINTF(D_NET, "Listening on unix dgram socket `%s'\n", *pp);
+ if (getsockopt(funix[j], SOL_SOCKET, SO_RCVBUF,
+ _len, ) == -1) {
+ logerror("getsockopt: SO_RCVBUF: `%s'", *pp);
+ continue;
+ }
+ if (buf_len >= RCVBUFLEN)
+ continue;
+ buf_len = RCVBUFLEN;
+ if (setsockopt(funix[j], SOL_SOCKET, SO_RCVBUF,
+ _len, socklen) == -1) {
+ logerror("setsockopt: SO_RCVBUF: `%s'", *pp);
+ continue;
+ }
}
if ((fklog = open(_PATH_KLOG, O_RDONLY, 0)) < 0) {
