Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-10]: src/sys/sys Pull up following revision(s) (requested by jakl...



details:   https://anonhg.NetBSD.org/src/rev/8bb792fcdcd3
branches:  netbsd-10
changeset: 373020:8bb792fcdcd3
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Jan 13 19:00:20 2023 +0000

description:
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)

diffstat:

 share/examples/secmodel/secmodel_example.c |  13 ++-----------
 sys/arch/sparc/conf/INSTALL                |   3 +--
 sys/conf/files                             |   3 +--
 sys/secmodel/suser/secmodel_suser.c        |  17 ++---------------
 sys/sys/kauth.h                            |   6 +++---
 5 files changed, 9 insertions(+), 33 deletions(-)

diffs (133 lines):

diff -r 0276fc5709f3 -r 8bb792fcdcd3 share/examples/secmodel/secmodel_example.c
--- a/share/examples/secmodel/secmodel_example.c        Thu Jan 12 12:12:29 2023 +0000
+++ b/share/examples/secmodel/secmodel_example.c        Fri Jan 13 19:00:20 2023 +0000
@@ -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 @@
                }
                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;
 
diff -r 0276fc5709f3 -r 8bb792fcdcd3 sys/arch/sparc/conf/INSTALL
--- a/sys/arch/sparc/conf/INSTALL       Thu Jan 12 12:12:29 2023 +0000
+++ b/sys/arch/sparc/conf/INSTALL       Fri Jan 13 19:00:20 2023 +0000
@@ -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 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
diff -r 0276fc5709f3 -r 8bb792fcdcd3 sys/conf/files
--- a/sys/conf/files    Thu Jan 12 12:12:29 2023 +0000
+++ b/sys/conf/files    Fri Jan 13 19:00:20 2023 +0000
@@ -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 bridge:      ifnet, ether
 defpseudo vether:      ifnet, ether
 defpseudo bpfilter:    ifnet, bpf_filter
-defpseudo strip:       ifnet
 defpseudo gre:         ifnet
 defpseudo gif:         ifnet
 defpseudo faith:       ifnet
diff -r 0276fc5709f3 -r 8bb792fcdcd3 sys/secmodel/suser/secmodel_suser.c
--- a/sys/secmodel/suser/secmodel_suser.c       Thu Jan 12 12:12:29 2023 +0000
+++ b/sys/secmodel/suser/secmodel_suser.c       Fri Jan 13 19:00:20 2023 +0000
@@ -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 <elad%NetBSD.org@localhost>
  * 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 @@
 
                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:
diff -r 0276fc5709f3 -r 8bb792fcdcd3 sys/sys/kauth.h
--- a/sys/sys/kauth.h   Thu Jan 12 12:12:29 2023 +0000
+++ b/sys/sys/kauth.h   Fri Jan 13 19:00:20 2023 +0000
@@ -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 <elad%NetBSD.org@localhost>  
@@ -256,7 +256,7 @@
        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 @@
        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,



Home | Main Index | Thread Index | Old Index