Module Name: src
Committed By: martin
Date: Fri Jan 13 19:00:21 UTC 2023
Modified Files:
src/share/examples/secmodel [netbsd-10]: secmodel_example.c
src/sys/arch/sparc/conf [netbsd-10]: INSTALL
src/sys/conf [netbsd-10]: files
src/sys/secmodel/suser [netbsd-10]: secmodel_suser.c
src/sys/sys [netbsd-10]: kauth.h
Log Message:
Pull up following revision(s) (requested by jakllsch in ticket #45):
sys/secmodel/suser/secmodel_suser.c: revision 1.56
sys/sys/kauth.h: revision 1.88
sys/arch/sparc/conf/INSTALL: revision 1.106
share/examples/secmodel/secmodel_example.c: revision 1.29
sys/conf/files: revision 1.1306
remove lingering strip(4) remnants
more strip(4) removal, this time in kauth(9)
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.28.10.1 \
src/share/examples/secmodel/secmodel_example.c
cvs rdiff -u -r1.105 -r1.105.20.1 src/sys/arch/sparc/conf/INSTALL
cvs rdiff -u -r1.1304 -r1.1304.2.1 src/sys/conf/files
cvs rdiff -u -r1.55 -r1.55.20.1 src/sys/secmodel/suser/secmodel_suser.c
cvs rdiff -u -r1.87 -r1.87.4.1 src/sys/sys/kauth.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/examples/secmodel/secmodel_example.c
diff -u src/share/examples/secmodel/secmodel_example.c:1.28 src/share/examples/secmodel/secmodel_example.c:1.28.10.1
--- src/share/examples/secmodel/secmodel_example.c:1.28 Sat Aug 25 09:54:37 2018
+++ src/share/examples/secmodel/secmodel_example.c Fri Jan 13 19:00:21 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_example.c,v 1.28 2018/08/25 09:54:37 maxv Exp $ */
+/* $NetBSD: secmodel_example.c,v 1.28.10.1 2023/01/13 19:00:21 martin Exp $ */
/*
* This file is placed in the public domain.
@@ -13,7 +13,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_example.c,v 1.28 2018/08/25 09:54:37 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_example.c,v 1.28.10.1 2023/01/13 19:00:21 martin Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -515,15 +515,6 @@ secmodel_example_network_cb(kauth_cred_t
}
break;
- case KAUTH_NETWORK_INTERFACE_STRIP:
- switch ((u_long)arg0) {
- case KAUTH_REQ_NETWORK_INTERFACE_STRIP_ADD:
- default:
- result = KAUTH_RESULT_DEFER;
- break;
- }
- break;
-
case KAUTH_NETWORK_ROUTE:
break;
Index: src/sys/arch/sparc/conf/INSTALL
diff -u src/sys/arch/sparc/conf/INSTALL:1.105 src/sys/arch/sparc/conf/INSTALL:1.105.20.1
--- src/sys/arch/sparc/conf/INSTALL:1.105 Sun Sep 27 13:48:54 2020
+++ src/sys/arch/sparc/conf/INSTALL Fri Jan 13 19:00:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.105 2020/09/27 13:48:54 roy Exp $
+# $NetBSD: INSTALL,v 1.105.20.1 2023/01/13 19:00:21 martin Exp $
#
# from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp
#
@@ -77,7 +77,6 @@ no audioamd0
no pseudo-device sl
no pseudo-device ppp
-no pseudo-device strip
no pseudo-device tun
no pseudo-device bpfilter
no pseudo-device npf # NPF packet filter
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1304 src/sys/conf/files:1.1304.2.1
--- src/sys/conf/files:1.1304 Sat Dec 3 01:04:42 2022
+++ src/sys/conf/files Fri Jan 13 19:00:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1304 2022/12/03 01:04:42 brad Exp $
+# $NetBSD: files,v 1.1304.2.1 2023/01/13 19:00:21 martin Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -1463,7 +1463,6 @@ defpseudo vlan: ifnet, ether
defpseudo bridge: ifnet, ether
defpseudo vether: ifnet, ether
defpseudo bpfilter: ifnet, bpf_filter
-defpseudo strip: ifnet
defpseudo gre: ifnet
defpseudo gif: ifnet
defpseudo faith: ifnet
Index: src/sys/secmodel/suser/secmodel_suser.c
diff -u src/sys/secmodel/suser/secmodel_suser.c:1.55 src/sys/secmodel/suser/secmodel_suser.c:1.55.20.1
--- src/sys/secmodel/suser/secmodel_suser.c:1.55 Tue Sep 8 14:12:57 2020
+++ src/sys/secmodel/suser/secmodel_suser.c Fri Jan 13 19:00:20 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_suser.c,v 1.55 2020/09/08 14:12:57 christos Exp $ */
+/* $NetBSD: secmodel_suser.c,v 1.55.20.1 2023/01/13 19:00:20 martin Exp $ */
/*-
* Copyright (c) 2006 Elad Efrat <[email protected]>
* All rights reserved.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_suser.c,v 1.55 2020/09/08 14:12:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_suser.c,v 1.55.20.1 2023/01/13 19:00:20 martin Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -700,19 +700,6 @@ secmodel_suser_network_cb(kauth_cred_t c
break;
- case KAUTH_NETWORK_INTERFACE_STRIP:
- switch (req) {
- case KAUTH_REQ_NETWORK_INTERFACE_STRIP_ADD:
- if (isroot)
- result = KAUTH_RESULT_ALLOW;
- break;
-
- default:
- break;
- }
-
- break;
-
case KAUTH_NETWORK_INTERFACE_TUN:
switch (req) {
case KAUTH_REQ_NETWORK_INTERFACE_TUN_ADD:
Index: src/sys/sys/kauth.h
diff -u src/sys/sys/kauth.h:1.87 src/sys/sys/kauth.h:1.87.4.1
--- src/sys/sys/kauth.h:1.87 Sun Mar 27 16:16:39 2022
+++ src/sys/sys/kauth.h Fri Jan 13 19:00:21 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kauth.h,v 1.87 2022/03/27 16:16:39 christos Exp $ */
+/* $NetBSD: kauth.h,v 1.87.4.1 2023/01/13 19:00:21 martin Exp $ */
/*-
* Copyright (c) 2005, 2006 Elad Efrat <[email protected]>
@@ -256,7 +256,7 @@ enum {
KAUTH_NETWORK_SOCKET,
KAUTH_NETWORK_INTERFACE_PPP,
KAUTH_NETWORK_INTERFACE_SLIP,
- KAUTH_NETWORK_INTERFACE_STRIP,
+ KAUTH_NETWORK_INTERFACE_STRIP, /* obsolete */
KAUTH_NETWORK_INTERFACE_TUN,
KAUTH_NETWORK_INTERFACE_BRIDGE,
KAUTH_NETWORK_IPSEC,
@@ -298,7 +298,7 @@ enum kauth_network_req {
KAUTH_REQ_NETWORK_SOCKET_SETPRIV,
KAUTH_REQ_NETWORK_INTERFACE_PPP_ADD,
KAUTH_REQ_NETWORK_INTERFACE_SLIP_ADD,
- KAUTH_REQ_NETWORK_INTERFACE_STRIP_ADD,
+ KAUTH_REQ_NETWORK_INTERFACE_STRIP_ADD, /* obsolete */
KAUTH_REQ_NETWORK_INTERFACE_TUN_ADD,
KAUTH_REQ_NETWORK_IPV6_HOPBYHOP,
KAUTH_REQ_NETWORK_INTERFACE_BRIDGE_GETPRIV,
