From owner-p4-projects Tue Jun 11 2: 6: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A81937B40E; Tue, 11 Jun 2002 02:05:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2FE2F37B407 for ; Tue, 11 Jun 2002 02:05:56 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5B95tK60826 for perforce@freebsd.org; Tue, 11 Jun 2002 02:05:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Jun 2002 02:05:55 -0700 (PDT) Message-Id: <200206110905.g5B95tK60826@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12692 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12692 Change 12692 by rwatson@rwatson_paprika on 2002/06/11 02:04:56 Synchronize mac_none and mac_test regarding recently added socket entry points. Reminded by: amigus Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#29 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#29 (text+ko) ==== @@ -525,6 +525,22 @@ } static int +mac_none_cred_check_bind_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) +{ + + return (0); +} + +static int +mac_none_cred_check_connect_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) +{ + + return (0); +} + +static int mac_none_cred_check_see_cred(struct ucred *u1, struct ucred *u2) { @@ -626,6 +642,14 @@ } static int +mac_none_cred_check_listen_socket(struct ucred *cred, struct vnode *vp, + struct label *socketlabel) +{ + + return (0); +} + +static int mac_none_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, struct label *filelabel, mode_t acc_mode) { @@ -872,6 +896,10 @@ (macop_t)mac_none_relabel_subject }, { MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET, (macop_t)mac_none_bpfdesc_check_receive_from_ifnet }, + { MAC_CRED_CHECK_BIND_SOCKET, + (macop_t)mac_none_cred_check_bind_socket }, + { MAC_CRED_CHECK_CONNECT_SOCKET, + (macop_t)mac_none_cred_check_connect_socket }, { MAC_CRED_CHECK_SEE_CRED, (macop_t)mac_none_cred_check_see_cred }, { MAC_CRED_CHECK_SEE_SOCKET, @@ -898,6 +926,8 @@ (macop_t)mac_none_cred_check_exec_vnode }, { MAC_CRED_CHECK_GETEXTATTR_VNODE, (macop_t)mac_none_cred_check_getextattr_vnode }, + { MAC_CRED_CHECK_LISTEN_SOCKET, + (macop_t)mac_none_cred_check_listen_socket }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_none_cred_check_open_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#2 (text+ko) ==== @@ -718,6 +718,22 @@ } static int +mac_test_cred_check_bind_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) +{ + + return (0); +} + +static int +mac_test_cred_check_connect_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) +{ + + return (0); +} + +static int mac_test_cred_check_see_cred(struct ucred *u1, struct ucred *u2) { @@ -819,6 +835,14 @@ } static int +mac_test_cred_check_listen_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) +{ + + return (0); +} + +static int mac_test_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, struct label *filelabel, mode_t acc_mode) { @@ -1063,6 +1087,10 @@ (macop_t)mac_test_relabel_subject }, { MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET, (macop_t)mac_test_bpfdesc_check_receive_from_ifnet }, + { MAC_CRED_CHECK_BIND_SOCKET, + (macop_t)mac_test_cred_check_bind_socket }, + { MAC_CRED_CHECK_CONNECT_SOCKET, + (macop_t)mac_test_cred_check_connect_socket }, { MAC_CRED_CHECK_SEE_CRED, (macop_t)mac_test_cred_check_see_cred }, { MAC_CRED_CHECK_SEE_SOCKET, @@ -1089,6 +1117,8 @@ (macop_t)mac_test_cred_check_exec_vnode }, { MAC_CRED_CHECK_GETEXTATTR_VNODE, (macop_t)mac_test_cred_check_getextattr_vnode }, + { MAC_CRED_CHECK_LISTEN_SOCKET, + (macop_t)mac_test_cred_check_listen_socket }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_test_cred_check_open_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message