PERFORCE change 41545 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=41545

Change 41545 by rwatson at 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;
 
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message