Module Name: src
Committed By: jakllsch
Date: Thu Jan 5 17:36:53 UTC 2023
Modified Files:
src/share/examples/secmodel: secmodel_example.c
src/sys/secmodel/suser: secmodel_suser.c
src/sys/sys: kauth.h
Log Message:
more strip(4) removal, this time in kauth(9)
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/share/examples/secmodel/secmodel_example.c
cvs rdiff -u -r1.55 -r1.56 src/sys/secmodel/suser/secmodel_suser.c
cvs rdiff -u -r1.87 -r1.88 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.29
--- src/share/examples/secmodel/secmodel_example.c:1.28 Sat Aug 25 09:54:37 2018
+++ src/share/examples/secmodel/secmodel_example.c Thu Jan 5 17:36:53 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.29 2023/01/05 17:36:53 jakllsch 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.29 2023/01/05 17:36:53 jakllsch 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/secmodel/suser/secmodel_suser.c
diff -u src/sys/secmodel/suser/secmodel_suser.c:1.55 src/sys/secmodel/suser/secmodel_suser.c:1.56
--- src/sys/secmodel/suser/secmodel_suser.c:1.55 Tue Sep 8 14:12:57 2020
+++ src/sys/secmodel/suser/secmodel_suser.c Thu Jan 5 17:36:53 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.56 2023/01/05 17:36:53 jakllsch Exp $ */
/*-
* Copyright (c) 2006 Elad Efrat <e...@netbsd.org>
* 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.56 2023/01/05 17:36:53 jakllsch 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.88
--- src/sys/sys/kauth.h:1.87 Sun Mar 27 16:16:39 2022
+++ src/sys/sys/kauth.h Thu Jan 5 17:36:53 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kauth.h,v 1.87 2022/03/27 16:16:39 christos Exp $ */
+/* $NetBSD: kauth.h,v 1.88 2023/01/05 17:36:53 jakllsch Exp $ */
/*-
* Copyright (c) 2005, 2006 Elad Efrat <e...@netbsd.org>
@@ -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,
