CVS commit: src
Module Name:src
Committed By: ozaki-r
Date: Fri Apr 15 01:38:17 UTC 2016
Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/net: Makefile
Added Files:
src/tests/net/if_pppoe: Makefile t_pppoe.sh
Log Message:
Add a new test case for PPPoE using PAP
>From s-yamaguchi@IIJ (with some tweaks by me)
To generate a diff of this commit:
cvs rdiff -u -r1.672 -r1.673 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.126 -r1.127 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.27 -r1.28 src/tests/net/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/if_pppoe/Makefile \
src/tests/net/if_pppoe/t_pppoe.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.672 src/distrib/sets/lists/tests/mi:1.673
--- src/distrib/sets/lists/tests/mi:1.672 Sat Apr 9 04:39:47 2016
+++ src/distrib/sets/lists/tests/mi Fri Apr 15 01:38:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.672 2016/04/09 04:39:47 riastradh Exp $
+# $NetBSD: mi,v 1.673 2016/04/15 01:38:16 ozaki-r Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3183,6 +3183,10 @@
./usr/tests/net/if_loop/Atffile tests-net-tests atf,rump
./usr/tests/net/if_loop/Kyuafile tests-net-tests atf,rump,kyua
./usr/tests/net/if_loop/t_pr tests-net-tests atf,rump
+./usr/tests/net/if_pppoe tests-net-tests compattestfile,atf
+./usr/tests/net/if_pppoe/Atffile tests-net-tests atf,rump
+./usr/tests/net/if_pppoe/Kyuafile tests-net-tests atf,rump,kyua
+./usr/tests/net/if_pppoe/t_pppoe tests-net-tests atf,rump
./usr/tests/net/if_taptests-net-tests compattestfile,atf
./usr/tests/net/if_tap/Atffile tests-net-tests atf,rump
./usr/tests/net/if_tap/Kyuafile tests-net-tests atf,rump,kyua
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.126 src/etc/mtree/NetBSD.dist.tests:1.127
--- src/etc/mtree/NetBSD.dist.tests:1.126 Fri Apr 8 10:09:16 2016
+++ src/etc/mtree/NetBSD.dist.tests Fri Apr 15 01:38:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.126 2016/04/08 10:09:16 gson Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.127 2016/04/15 01:38:17 ozaki-r Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -324,6 +324,7 @@
./usr/tests/net/if_bridge
./usr/tests/net/if_gif
./usr/tests/net/if_loop
+./usr/tests/net/if_pppoe
./usr/tests/net/if_tap
./usr/tests/net/in_cksum
./usr/tests/net/mcast
Index: src/tests/net/Makefile
diff -u src/tests/net/Makefile:1.27 src/tests/net/Makefile:1.28
--- src/tests/net/Makefile:1.27 Fri Mar 4 02:44:45 2016
+++ src/tests/net/Makefile Fri Apr 15 01:38:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2016/03/04 02:44:45 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.28 2016/04/15 01:38:17 ozaki-r Exp $
.include
@@ -7,7 +7,7 @@ TESTSDIR= ${TESTSBASE}/net
TESTS_SUBDIRS= fdpass in_cksum net sys
.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
TESTS_SUBDIRS+= arp bpf bpfilter carp icmp if if_bridge if_gif if_loop
-TESTS_SUBDIRS+= if_tap mcast mpls ndp npf route
+TESTS_SUBDIRS+= if_pppoe if_tap mcast mpls ndp npf route
.if (${MKSLJIT} != "no")
TESTS_SUBDIRS+= bpfjit
.endif
Added files:
Index: src/tests/net/if_pppoe/Makefile
diff -u /dev/null src/tests/net/if_pppoe/Makefile:1.1
--- /dev/null Fri Apr 15 01:38:17 2016
+++ src/tests/net/if_pppoe/Makefile Fri Apr 15 01:38:17 2016
@@ -0,0 +1,8 @@
+
+.include
+
+TESTSDIR= ${TESTSBASE}/net/if_pppoe
+
+TESTS_SH= t_pppoe
+
+.include
Index: src/tests/net/if_pppoe/t_pppoe.sh
diff -u /dev/null src/tests/net/if_pppoe/t_pppoe.sh:1.1
--- /dev/null Fri Apr 15 01:38:17 2016
+++ src/tests/net/if_pppoe/t_pppoe.sh Fri Apr 15 01:38:17 2016
@@ -0,0 +1,192 @@
+# $NetBSD: t_pppoe.sh,v 1.1 2016/04/15 01:38:17 ozaki-r Exp $
+#
+# Copyright (c) 2016 Internet Initiative Japan Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+#
CVS commit: src
Module Name:src Committed By: ozaki-r Date: Fri Apr 15 01:38:17 UTC 2016 Modified Files: src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.tests src/tests/net: Makefile Added Files: src/tests/net/if_pppoe: Makefile t_pppoe.sh Log Message: Add a new test case for PPPoE using PAP >From s-yamaguchi@IIJ (with some tweaks by me) To generate a diff of this commit: cvs rdiff -u -r1.672 -r1.673 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.126 -r1.127 src/etc/mtree/NetBSD.dist.tests cvs rdiff -u -r1.27 -r1.28 src/tests/net/Makefile cvs rdiff -u -r0 -r1.1 src/tests/net/if_pppoe/Makefile \ src/tests/net/if_pppoe/t_pppoe.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: ozaki-r Date: Fri Apr 15 01:35:26 UTC 2016 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/comp: mi shl.mi src/distrib/sets/lists/debug: mi shl.mi src/sys/rump/include/opt: opt_rumpkernel.h pppoe.h src/sys/rump/librump/rumpnet: net_stub.c src/sys/rump/net: Makefile.rumpnetcomp src/sys/rump/net/lib/libnet: Makefile Added Files: src/sys/rump/net/lib/libpppoe: Makefile PPPOE.ioconf pppoe_component.c Log Message: Rump-ify if_pppoe >From s-yamaguchi@IIJ To generate a diff of this commit: cvs rdiff -u -r1.768 -r1.769 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.2029 -r1.2030 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.287 -r1.288 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.151 -r1.152 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.130 -r1.131 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.4 -r1.5 src/sys/rump/include/opt/opt_rumpkernel.h cvs rdiff -u -r1.1 -r1.2 src/sys/rump/include/opt/pppoe.h cvs rdiff -u -r1.21 -r1.22 src/sys/rump/librump/rumpnet/net_stub.c cvs rdiff -u -r1.13 -r1.14 src/sys/rump/net/Makefile.rumpnetcomp cvs rdiff -u -r1.27 -r1.28 src/sys/rump/net/lib/libnet/Makefile cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libpppoe/Makefile \ src/sys/rump/net/lib/libpppoe/PPPOE.ioconf \ src/sys/rump/net/lib/libpppoe/pppoe_component.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.768 src/distrib/sets/lists/base/shl.mi:1.769 --- src/distrib/sets/lists/base/shl.mi:1.768 Mon Apr 11 08:44:40 2016 +++ src/distrib/sets/lists/base/shl.mi Fri Apr 15 01:35:25 2016 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.768 2016/04/11 08:44:40 roy Exp $ +# $NetBSD: shl.mi,v 1.769 2016/04/15 01:35:25 ozaki-r Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -721,6 +721,9 @@ ./usr/lib/librumpnet_npf.so base-rump-shlib rump ./usr/lib/librumpnet_npf.so.0 base-rump-shlib rump ./usr/lib/librumpnet_npf.so.0.0 base-rump-shlib rump +./usr/lib/librumpnet_pppoe.so base-rump-shlib rump +./usr/lib/librumpnet_pppoe.so.0 base-rump-shlib rump +./usr/lib/librumpnet_pppoe.so.0.0 base-rump-shlib rump ./usr/lib/librumpnet_shmif.so base-rump-shlib rump ./usr/lib/librumpnet_shmif.so.0 base-rump-shlib rump ./usr/lib/librumpnet_shmif.so.0.0 base-rump-shlib rump Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2029 src/distrib/sets/lists/comp/mi:1.2030 --- src/distrib/sets/lists/comp/mi:1.2029 Sun Apr 10 19:05:50 2016 +++ src/distrib/sets/lists/comp/mi Fri Apr 15 01:35:26 2016 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2029 2016/04/10 19:05:50 roy Exp $ +# $NetBSD: mi,v 1.2030 2016/04/15 01:35:26 ozaki-r Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -3547,6 +3547,8 @@ ./usr/lib/librumpnet_npf.a comp-c-lib rump ./usr/lib/librumpnet_npf_p.a comp-c-lib rump,profile ./usr/lib/librumpnet_p.a comp-c-proflib compatfile,rump,profile +./usr/lib/librumpnet_pppoe.a comp-c-lib rump +./usr/lib/librumpnet_pppoe_p.a comp-c-proflib rump,profile ./usr/lib/librumpnet_shmif.a comp-c-lib rump ./usr/lib/librumpnet_shmif_p.a comp-c-proflib rump,profile ./usr/lib/librumpnet_sockin.a comp-c-lib rump Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.287 src/distrib/sets/lists/comp/shl.mi:1.288 --- src/distrib/sets/lists/comp/shl.mi:1.287 Wed Mar 16 05:32:09 2016 +++ src/distrib/sets/lists/comp/shl.mi Fri Apr 15 01:35:26 2016 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.287 2016/03/16 05:32:09 mrg Exp $ +# $NetBSD: shl.mi,v 1.288 2016/04/15 01:35:26 ozaki-r Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -226,6 +226,7 @@ ./usr/lib/librumpnet_netmpls_pic.a comp-c-piclib picinstall,rump ./usr/lib/librumpnet_npf_pic.a comp-c-piclib picinstall,rump ./usr/lib/librumpnet_pic.a comp-c-piclib compatfile,picinstall,rump +./usr/lib/librumpnet_pppoe_pic.a comp-c-piclib picinstall,rump ./usr/lib/librumpnet_shmif_pic.a comp-c-piclib picinstall,rump ./usr/lib/librumpnet_sockin_pic.a comp-c-piclib picinstall,rump ./usr/lib/librumpnet_tap_pic.a comp-c-piclib picinstall,rump Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.151 src/distrib/sets/lists/debug/mi:1.152 --- src/distrib/sets/lists/debug/mi:1.151 Sun Apr 10 21:45:33 2016 +++ src/distrib/sets/lists/debug/mi Fri Apr 15 01:35:26 2016 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.151 2016/04/10 21:45:33 kamil Exp $ +# $NetBSD: mi,v 1.152 2016/04/15 01:35:26 ozaki-r Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib
CVS commit: src
Module Name:src Committed By: ozaki-r Date: Fri Apr 15 01:35:26 UTC 2016 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/comp: mi shl.mi src/distrib/sets/lists/debug: mi shl.mi src/sys/rump/include/opt: opt_rumpkernel.h pppoe.h src/sys/rump/librump/rumpnet: net_stub.c src/sys/rump/net: Makefile.rumpnetcomp src/sys/rump/net/lib/libnet: Makefile Added Files: src/sys/rump/net/lib/libpppoe: Makefile PPPOE.ioconf pppoe_component.c Log Message: Rump-ify if_pppoe >From s-yamaguchi@IIJ To generate a diff of this commit: cvs rdiff -u -r1.768 -r1.769 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.2029 -r1.2030 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.287 -r1.288 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.151 -r1.152 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.130 -r1.131 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.4 -r1.5 src/sys/rump/include/opt/opt_rumpkernel.h cvs rdiff -u -r1.1 -r1.2 src/sys/rump/include/opt/pppoe.h cvs rdiff -u -r1.21 -r1.22 src/sys/rump/librump/rumpnet/net_stub.c cvs rdiff -u -r1.13 -r1.14 src/sys/rump/net/Makefile.rumpnetcomp cvs rdiff -u -r1.27 -r1.28 src/sys/rump/net/lib/libnet/Makefile cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libpppoe/Makefile \ src/sys/rump/net/lib/libpppoe/PPPOE.ioconf \ src/sys/rump/net/lib/libpppoe/pppoe_component.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src
Committed By: ozaki-r
Date: Fri Apr 15 01:31:29 UTC 2016
Modified Files:
src/sys/net: if_ethersubr.c if_pppoe.c if_pppoe.h
Log Message:
Hide PPPoE variables from if_ethersubr.c
This improves modularity of if_pppoe.
>From s-yamaguchi@IIJ
To generate a diff of this commit:
cvs rdiff -u -r1.217 -r1.218 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.104 -r1.105 src/sys/net/if_pppoe.c
cvs rdiff -u -r1.12 -r1.13 src/sys/net/if_pppoe.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.217 src/sys/net/if_ethersubr.c:1.218
--- src/sys/net/if_ethersubr.c:1.217 Thu Apr 7 03:22:15 2016
+++ src/sys/net/if_ethersubr.c Fri Apr 15 01:31:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.217 2016/04/07 03:22:15 christos Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.218 2016/04/15 01:31:29 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.217 2016/04/07 03:22:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.218 2016/04/15 01:31:29 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -696,29 +696,10 @@ ether_input(struct ifnet *ifp, struct mb
}
#if NPPPOE > 0
case ETHERTYPE_PPPOEDISC:
+ pppoedisc_input(ifp, m);
+ return;
case ETHERTYPE_PPPOE:
- if (m->m_flags & M_PROMISC) {
- m_freem(m);
- return;
- }
-#ifndef PPPOE_SERVER
- if (m->m_flags & (M_MCAST | M_BCAST)) {
- m_freem(m);
- return;
- }
-#endif
-
- if (etype == ETHERTYPE_PPPOEDISC)
- inq =
- else
- inq =
- if (IF_QFULL(inq)) {
- IF_DROP(inq);
- m_freem(m);
- } else {
- IF_ENQUEUE(inq, m);
- softint_schedule(pppoe_softintr);
- }
+ pppoe_input(ifp, m);
return;
#endif /* NPPPOE > 0 */
case ETHERTYPE_SLOWPROTOCOLS: {
Index: src/sys/net/if_pppoe.c
diff -u src/sys/net/if_pppoe.c:1.104 src/sys/net/if_pppoe.c:1.105
--- src/sys/net/if_pppoe.c:1.104 Mon Aug 24 22:21:26 2015
+++ src/sys/net/if_pppoe.c Fri Apr 15 01:31:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.104 2015/08/24 22:21:26 pooka Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.105 2016/04/15 01:31:29 ozaki-r Exp $ */
/*-
* Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.104 2015/08/24 22:21:26 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.105 2016/04/15 01:31:29 ozaki-r Exp $");
#include "pppoe.h"
@@ -160,10 +160,11 @@ static void pppoe_softintr_handler(void
extern int sppp_ioctl(struct ifnet *, unsigned long, void *);
/* input routines */
-static void pppoe_input(void);
+static void pppoeintr(void);
static void pppoe_disc_input(struct mbuf *);
static void pppoe_dispatch_disc_pkt(struct mbuf *, int);
static void pppoe_data_input(struct mbuf *);
+static void pppoe_enqueue(struct ifqueue *, struct mbuf *);
/* management routines */
static int pppoe_connect(struct pppoe_softc *);
@@ -349,13 +350,13 @@ pppoe_softintr_handler(void *dummy)
{
/* called at splsoftnet() */
mutex_enter(softnet_lock);
- pppoe_input();
+ pppoeintr();
mutex_exit(softnet_lock);
}
/* called at appropriate protection level */
static void
-pppoe_input(void)
+pppoeintr(void)
{
struct mbuf *m;
int s, disc_done, data_done;
@@ -1564,3 +1565,42 @@ pppoe_clear_softc(struct pppoe_softc *sc
sc->sc_ac_cookie_len = 0;
sc->sc_session = 0;
}
+
+static void
+pppoe_enqueue(struct ifqueue *inq, struct mbuf *m)
+{
+ if (m->m_flags & M_PROMISC) {
+ m_free(m);
+ return;
+ }
+
+#ifndef PPPOE_SERVER
+ if (m->m_flags & (M_MCAST | M_BCAST)) {
+ m_free(m);
+ return;
+ }
+#endif
+
+ if (IF_QFULL(inq)) {
+ IF_DROP(inq);
+ m_freem(m);
+ } else {
+ IF_ENQUEUE(inq, m);
+ softint_schedule(pppoe_softintr);
+ }
+ return;
+}
+
+void
+pppoe_input(struct ifnet *ifp, struct mbuf *m)
+{
+ pppoe_enqueue(, m);
+ return;
+}
+
+void
+pppoedisc_input(struct ifnet *ifp, struct mbuf *m)
+{
+ pppoe_enqueue(, m);
+ return;
+}
Index: src/sys/net/if_pppoe.h
diff -u src/sys/net/if_pppoe.h:1.12 src/sys/net/if_pppoe.h:1.13
--- src/sys/net/if_pppoe.h:1.12 Sun Sep 6 06:01:01 2015
+++ src/sys/net/if_pppoe.h Fri Apr 15 01:31:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.h,v 1.12 2015/09/06 06:01:01 dholland Exp $ */
+/* $NetBSD: if_pppoe.h,v 1.13 2016/04/15 01:31:29 ozaki-r Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -66,11 +66,8 @@ struct pppoeconnectionstate {
#ifdef _KERNEL
-extern struct ifqueue ppoediscinq;
-extern struct ifqueue ppoeinq;
-
-extern void *pppoe_softintr; /* softinterrupt cookie */
-
+void pppoe_input(struct ifnet *, struct mbuf *);
+void pppoedisc_input(struct ifnet *, struct mbuf *);
#endif /* _KERNEL */
#endif /* !_NET_IF_PPPOE_H_ */
CVS commit: src/sys/net
Module Name:src Committed By: ozaki-r Date: Fri Apr 15 01:31:29 UTC 2016 Modified Files: src/sys/net: if_ethersubr.c if_pppoe.c if_pppoe.h Log Message: Hide PPPoE variables from if_ethersubr.c This improves modularity of if_pppoe. >From s-yamaguchi@IIJ To generate a diff of this commit: cvs rdiff -u -r1.217 -r1.218 src/sys/net/if_ethersubr.c cvs rdiff -u -r1.104 -r1.105 src/sys/net/if_pppoe.c cvs rdiff -u -r1.12 -r1.13 src/sys/net/if_pppoe.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/common
Module Name:src Committed By: salazar Date: Thu Apr 14 21:16:18 UTC 2016 Modified Files: src/distrib/notes/common: main Log Message: add lneto To generate a diff of this commit: cvs rdiff -u -r1.524 -r1.525 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/common
Module Name:src Committed By: salazar Date: Thu Apr 14 21:16:18 UTC 2016 Modified Files: src/distrib/notes/common: main Log Message: add lneto To generate a diff of this commit: cvs rdiff -u -r1.524 -r1.525 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.524 src/distrib/notes/common/main:1.525 --- src/distrib/notes/common/main:1.524 Thu Aug 13 13:21:04 2015 +++ src/distrib/notes/common/main Thu Apr 14 21:16:18 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: main,v 1.524 2015/08/13 13:21:04 leot Exp $ +.\" $NetBSD: main,v 1.525 2016/04/14 21:16:18 salazar Exp $ .\" .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -1314,6 +1314,7 @@ If you're one of them, and would like to .It Ta Alexander Nasonov Ta Mt al...@netbsd.org .It Ta Phil Nelson Ta Mt p...@netbsd.org .It Ta John Nemeth Ta Mt jnem...@netbsd.org +.It Ta Lourival Pereira Vieira Neto Ta Mt ln...@netbsd.org .It Ta NISHIMURA Takeshi Ta Mt nsmr...@netbsd.org .It Ta Tohru Nishimura Ta Mt nisim...@netbsd.org .It Ta NONAKA Kimihiro Ta Mt non...@netbsd.org
CVS commit: src/libexec/ld.elf_so/arch
Module Name:src Committed By: skrll Date: Thu Apr 14 20:17:08 UTC 2016 Modified Files: src/libexec/ld.elf_so/arch/m68k: mdreloc.c src/libexec/ld.elf_so/arch/sh3: mdreloc.c src/libexec/ld.elf_so/arch/vax: mdreloc.c Log Message: Remove duplicated __RCSIDs I added years ago - I blame CVS. Spotted by Miod Vallat To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/libexec/ld.elf_so/arch/m68k/mdreloc.c cvs rdiff -u -r1.31 -r1.32 src/libexec/ld.elf_so/arch/sh3/mdreloc.c cvs rdiff -u -r1.30 -r1.31 src/libexec/ld.elf_so/arch/vax/mdreloc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/ld.elf_so/arch
Module Name:src
Committed By: skrll
Date: Thu Apr 14 20:17:08 UTC 2016
Modified Files:
src/libexec/ld.elf_so/arch/m68k: mdreloc.c
src/libexec/ld.elf_so/arch/sh3: mdreloc.c
src/libexec/ld.elf_so/arch/vax: mdreloc.c
Log Message:
Remove duplicated __RCSIDs I added years ago - I blame CVS.
Spotted by Miod Vallat
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/libexec/ld.elf_so/arch/m68k/mdreloc.c
cvs rdiff -u -r1.31 -r1.32 src/libexec/ld.elf_so/arch/sh3/mdreloc.c
cvs rdiff -u -r1.30 -r1.31 src/libexec/ld.elf_so/arch/vax/mdreloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/arch/m68k/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/m68k/mdreloc.c:1.30 src/libexec/ld.elf_so/arch/m68k/mdreloc.c:1.31
--- src/libexec/ld.elf_so/arch/m68k/mdreloc.c:1.30 Mon Aug 25 20:40:52 2014
+++ src/libexec/ld.elf_so/arch/m68k/mdreloc.c Thu Apr 14 20:17:07 2016
@@ -1,13 +1,8 @@
-/* $NetBSD: mdreloc.c,v 1.30 2014/08/25 20:40:52 joerg Exp $ */
+/* $NetBSD: mdreloc.c,v 1.31 2016/04/14 20:17:07 skrll Exp $ */
#include
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.30 2014/08/25 20:40:52 joerg Exp $");
-#endif /* not lint */
-
-#include
-#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.30 2014/08/25 20:40:52 joerg Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.31 2016/04/14 20:17:07 skrll Exp $");
#endif /* not lint */
#include
Index: src/libexec/ld.elf_so/arch/sh3/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/sh3/mdreloc.c:1.31 src/libexec/ld.elf_so/arch/sh3/mdreloc.c:1.32
--- src/libexec/ld.elf_so/arch/sh3/mdreloc.c:1.31 Mon Aug 25 20:40:52 2014
+++ src/libexec/ld.elf_so/arch/sh3/mdreloc.c Thu Apr 14 20:17:07 2016
@@ -1,13 +1,8 @@
-/* $NetBSD: mdreloc.c,v 1.31 2014/08/25 20:40:52 joerg Exp $ */
+/* $NetBSD: mdreloc.c,v 1.32 2016/04/14 20:17:07 skrll Exp $ */
#include
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.31 2014/08/25 20:40:52 joerg Exp $");
-#endif /* not lint */
-
-#include
-#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.31 2014/08/25 20:40:52 joerg Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.32 2016/04/14 20:17:07 skrll Exp $");
#endif /* not lint */
#include
Index: src/libexec/ld.elf_so/arch/vax/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/vax/mdreloc.c:1.30 src/libexec/ld.elf_so/arch/vax/mdreloc.c:1.31
--- src/libexec/ld.elf_so/arch/vax/mdreloc.c:1.30 Mon Aug 25 20:40:53 2014
+++ src/libexec/ld.elf_so/arch/vax/mdreloc.c Thu Apr 14 20:17:07 2016
@@ -1,13 +1,8 @@
-/* $NetBSD: mdreloc.c,v 1.30 2014/08/25 20:40:53 joerg Exp $ */
+/* $NetBSD: mdreloc.c,v 1.31 2016/04/14 20:17:07 skrll Exp $ */
#include
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.30 2014/08/25 20:40:53 joerg Exp $");
-#endif /* not lint */
-
-#include
-#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.30 2014/08/25 20:40:53 joerg Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.31 2016/04/14 20:17:07 skrll Exp $");
#endif /* not lint */
#include
CVS commit: src/sys/netinet
Module Name:src
Committed By: rjs
Date: Thu Apr 14 18:36:56 UTC 2016
Modified Files:
src/sys/netinet: sctp_pcb.c
Log Message:
Remove stray debug printf().
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/netinet/sctp_pcb.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/netinet/sctp_pcb.c
diff -u src/sys/netinet/sctp_pcb.c:1.2 src/sys/netinet/sctp_pcb.c:1.3
--- src/sys/netinet/sctp_pcb.c:1.2 Sun Apr 3 09:57:40 2016
+++ src/sys/netinet/sctp_pcb.c Thu Apr 14 18:36:56 2016
@@ -1,5 +1,5 @@
/* $KAME: sctp_pcb.c,v 1.39 2005/06/16 18:29:25 jinmei Exp $ */
-/* $NetBSD: sctp_pcb.c,v 1.2 2016/04/03 09:57:40 mlelstv Exp $ */
+/* $NetBSD: sctp_pcb.c,v 1.3 2016/04/14 18:36:56 rjs Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
@@ -33,7 +33,7 @@
* SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sctp_pcb.c,v 1.2 2016/04/03 09:57:40 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_pcb.c,v 1.3 2016/04/14 18:36:56 rjs Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1312,7 +1312,6 @@ sctp_inpcb_alloc(struct socket *so)
error = 0;
- printf("sctp_inpcb_alloc: starting\n");
/* Hack alert:
*
* This code audits the entire INP list to see if
CVS commit: src/sys/netinet
Module Name:src Committed By: rjs Date: Thu Apr 14 18:36:56 UTC 2016 Modified Files: src/sys/netinet: sctp_pcb.c Log Message: Remove stray debug printf(). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/netinet/sctp_pcb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: christos Date: Thu Apr 14 16:42:09 UTC 2016 Modified Files: src/crypto/external/bsd/openssh/dist: session.c Log Message: If PAM is configured to read user-specified environment variables and UseLogin=yes in sshd_config, then a hostile local user may attack /bin/login via LD_PRELOAD or similar environment variables set via PAM. CVE-2015-8325, found by Shayan Sadigh, via Colin Watson https://anongit.mindrot.org/openssh.git/commit/?\ id=85bdcd7c92fe7ff133bbc4e10a65c91810f88755 XXX: pullup-7 To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/session.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: christos
Date: Thu Apr 14 16:42:09 UTC 2016
Modified Files:
src/crypto/external/bsd/openssh/dist: session.c
Log Message:
If PAM is configured to read user-specified environment variables
and UseLogin=yes in sshd_config, then a hostile local user may
attack /bin/login via LD_PRELOAD or similar environment variables
set via PAM.
CVE-2015-8325, found by Shayan Sadigh, via Colin Watson
https://anongit.mindrot.org/openssh.git/commit/?\
id=85bdcd7c92fe7ff133bbc4e10a65c91810f88755
XXX: pullup-7
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/session.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/session.c
diff -u src/crypto/external/bsd/openssh/dist/session.c:1.18 src/crypto/external/bsd/openssh/dist/session.c:1.19
--- src/crypto/external/bsd/openssh/dist/session.c:1.18 Thu Mar 10 20:55:00 2016
+++ src/crypto/external/bsd/openssh/dist/session.c Thu Apr 14 12:42:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: session.c,v 1.18 2016/03/11 01:55:00 christos Exp $ */
+/* $NetBSD: session.c,v 1.19 2016/04/14 16:42:09 christos Exp $ */
/* $OpenBSD: session.c,v 1.280 2016/02/16 03:37:48 djm Exp $ */
/*
@@ -36,7 +36,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: session.c,v 1.18 2016/03/11 01:55:00 christos Exp $");
+__RCSID("$NetBSD: session.c,v 1.19 2016/04/14 16:42:09 christos Exp $");
#include
#include
#include
@@ -1226,7 +1226,7 @@ do_setup_env(Session *s, const char *she
* Pull in any environment variables that may have
* been set by PAM.
*/
- if (options.use_pam) {
+ if (options.use_pam && !options.use_login) {
char **p;
p = fetch_pam_child_environment();
