From owner-p4-projects@FreeBSD.ORG Wed Nov 5 19:37:27 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B09216A4D0; Wed, 5 Nov 2003 19:37:27 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3558716A4CE for ; Wed, 5 Nov 2003 19:37:27 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CCD6243FF2 for ; Wed, 5 Nov 2003 19:37:25 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA63bPXJ079998 for ; Wed, 5 Nov 2003 19:37:25 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA63bO3D079995 for perforce@freebsd.org; Wed, 5 Nov 2003 19:37:24 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 5 Nov 2003 19:37:24 -0800 (PST) Message-Id: <200311060337.hA63bO3D079995@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 41545 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Nov 2003 03:37:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=41545 Change 41545 by rwatson@rwatson_paprika on 2003/11/05 19:36:59 Remove flags argument from externalize function: it's not used. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#421 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_internal.h#10 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_net.c#5 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_pipe.c#6 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_process.c#5 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_vfs.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#421 (text+ko) ==== @@ -589,7 +589,7 @@ buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); error = mac_externalize_cred_label(&tcred->cr_label, elements, - buffer, mac.m_buflen, M_WAITOK); + buffer, mac.m_buflen); if (error == 0) error = copyout(buffer, mac.m_string, strlen(buffer)+1); @@ -626,7 +626,7 @@ buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); error = mac_externalize_cred_label(&td->td_ucred->cr_label, - elements, buffer, mac.m_buflen, M_WAITOK); + elements, buffer, mac.m_buflen); if (error == 0) error = copyout(buffer, mac.m_string, strlen(buffer)+1); @@ -780,12 +780,12 @@ case DTYPE_VNODE: if (error == 0) error = mac_externalize_vnode_label(&intlabel, - elements, buffer, mac.m_buflen, M_WAITOK); + elements, buffer, mac.m_buflen); mac_destroy_vnode_label(&intlabel); break; case DTYPE_PIPE: error = mac_externalize_pipe_label(&intlabel, elements, - buffer, mac.m_buflen, M_WAITOK); + buffer, mac.m_buflen); mac_destroy_pipe_label(&intlabel); break; default: @@ -841,7 +841,7 @@ mac_init_vnode_label(&intlabel); mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel); error = mac_externalize_vnode_label(&intlabel, elements, buffer, - mac.m_buflen, M_WAITOK); + mac.m_buflen); NDFREE(&nd, 0); mac_destroy_vnode_label(&intlabel); @@ -896,7 +896,7 @@ mac_init_vnode_label(&intlabel); mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel); error = mac_externalize_vnode_label(&intlabel, elements, buffer, - mac.m_buflen, M_WAITOK); + mac.m_buflen); NDFREE(&nd, 0); mac_destroy_vnode_label(&intlabel); ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_internal.h#10 (text+ko) ==== @@ -102,7 +102,7 @@ int mac_check_cred_relabel(struct ucred *cred, struct label *newlabel); void mac_destroy_cred_label(struct label *label); int mac_externalize_cred_label(struct label *label, char *elements, - char *outbuf, size_t outbuflen, int flags); + char *outbuf, size_t outbuflen); void mac_init_cred_label(struct label *label); int mac_internalize_cred_label(struct label *label, char *string); void mac_relabel_cred(struct ucred *cred, struct label *newlabel); @@ -110,12 +110,12 @@ void mac_copy_pipe_label(struct label *src, struct label *dest); void mac_destroy_pipe_label(struct label *label); int mac_externalize_pipe_label(struct label *label, char *elements, - char *outbuf, size_t outbuflen, int flags); + char *outbuf, size_t outbuflen); void mac_init_pipe_label(struct label *label); int mac_internalize_pipe_label(struct label *label, char *string); int mac_externalize_vnode_label(struct label *label, char *elements, - char *outbuf, size_t outbuflen, int flags); + char *outbuf, size_t outbuflen); int mac_internalize_vnode_label(struct label *label, char *string); void mac_check_vnode_mmap_downgrade(struct ucred *cred, struct vnode *vp, int *prot); ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_net.c#5 (text+ko) ==== @@ -333,7 +333,7 @@ static int mac_externalize_ifnet_label(struct label *label, char *elements, - char *outbuf, size_t outbuflen, int flags) + char *outbuf, size_t outbuflen) { int error; @@ -344,7 +344,7 @@ static int mac_externalize_socket_label(struct label *label, char *elements, - char *outbuf, size_t outbuflen, int flags) + char *outbuf, size_t outbuflen) { int error; @@ -355,7 +355,7 @@ static int mac_externalize_socket_peer_label(struct label *label, char *elements, - char *outbuf, size_t outbuflen, int flags) + char *outbuf, size_t outbuflen) { int error; @@ -787,7 +787,7 @@ buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); error = mac_externalize_ifnet_label(&ifnet->if_label, elements, - buffer, mac.m_buflen, M_WAITOK); + buffer, mac.m_buflen); if (error == 0) error = copyout(buffer, mac.m_string, strlen(buffer)+1); @@ -912,7 +912,7 @@ buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); error = mac_externalize_socket_label(&so->so_label, elements, - buffer, mac->m_buflen, M_WAITOK); + buffer, mac->m_buflen); if (error == 0) error = copyout(buffer, mac->m_string, strlen(buffer)+1); @@ -942,7 +942,7 @@ buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); error = mac_externalize_socket_peer_label(&so->so_peerlabel, - elements, buffer, mac->m_buflen, M_WAITOK); + elements, buffer, mac->m_buflen); if (error == 0) error = copyout(buffer, mac->m_string, strlen(buffer)+1); ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_pipe.c#6 (text+ko) ==== @@ -109,7 +109,7 @@ int mac_externalize_pipe_label(struct label *label, char *elements, - char *outbuf, size_t outbuflen, int flags) + char *outbuf, size_t outbuflen) { int error; ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_process.c#5 (text+ko) ==== @@ -148,7 +148,7 @@ int mac_externalize_cred_label(struct label *label, char *elements, - char *outbuf, size_t outbuflen, int flags) + char *outbuf, size_t outbuflen) { int error; ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_vfs.c#4 (text+ko) ==== @@ -181,7 +181,7 @@ int mac_externalize_vnode_label(struct label *label, char *elements, - char *outbuf, size_t outbuflen, int flags) + char *outbuf, size_t outbuflen) { int error;