X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=original%2Fman2%2Fmsgctl.2;h=a89559c2d7da132299c747ee7539accdfaaee548;hb=110dba020f489b75aff2497105f7970c05e2b87c;hp=9ffd75bf45b312ef28ee3c655a6650ba9758c7e4;hpb=bf11c0c4717abfd30785b3991b933f4687bb24fc;p=linuxjm%2FLDP_man-pages.git

diff --git a/original/man2/msgctl.2 b/original/man2/msgctl.2
index 9ffd75bf..a89559c2 100644
--- a/original/man2/msgctl.2
+++ b/original/man2/msgctl.2
@@ -34,7 +34,7 @@
 .\"	Added msqid_ds and ipc_perm structure definitions
 .\" 2005-08-02, mtk: Added IPC_INFO, MSG_INFO, MSG_STAT descriptions
 .\"
-.TH MSGCTL 2 2012-05-31 "Linux" "Linux Programmer's Manual"
+.TH MSGCTL 2 2014-02-24 "Linux" "Linux Programmer's Manual"
 .SH NAME
 msgctl \- System V message control operations
 .SH SYNOPSIS
@@ -49,7 +49,7 @@ msgctl \- System V message control operations
 .BR msgctl ()
 performs the control operation specified by
 .I cmd
-on the System V message queue with identifier
+on the System\ V message queue with identifier
 .IR msqid .
 .PP
 The
@@ -129,7 +129,7 @@ or creator
 .RI ( msg_perm.cuid )
 of the message queue, or the caller must be privileged.
 Appropriate privilege (Linux: the
-.B CAP_IPC_RESOURCE
+.B CAP_SYS_RESOURCE
 capability) is required to raise the
 .I msg_qbytes
 value beyond the system parameter
@@ -145,9 +145,12 @@ set to
 The calling process must have appropriate privileges
 or its effective user ID must be either that of the creator or owner
 of the message queue.
+The third argument to
+.BR msgctl ()
+is ignored in this case.
 .TP
 .BR IPC_INFO " (Linux-specific)"
-Returns information about system-wide message queue limits and
+Return information about system-wide message queue limits and
 parameters in the structure pointed to by
 .IR buf .
 This structure is of type
@@ -197,7 +200,7 @@ files of the same name; see
 for details.
 .TP
 .BR MSG_INFO " (Linux-specific)"
-Returns a
+Return a
 .I msginfo
 structure containing the same information as for
 .BR IPC_INFO ,
@@ -214,7 +217,7 @@ field returns the total number of bytes in all messages
 in all queues on the system.
 .TP
 .BR MSG_STAT " (Linux-specific)"
-Returns a
+Return a
 .I msqid_ds
 structure as for
 .BR IPC_STAT .
@@ -305,9 +308,20 @@ or the owner
 (as found in
 .IR msg_perm.uid )
 of the message queue,
-and the process is not privileged (Linux: it does not have the
+and the caller is not privileged (Linux: does not have the
 .B CAP_SYS_ADMIN
 capability).
+.TP
+.B EPERM
+An attempt
+.RB ( IPC_SET )
+was made to increase
+.I msg_qbytes
+beyond the system parameter
+.BR MSGMNB ,
+but the caller is not privileged (Linux: does not have the
+.B CAP_SYS_RESOURCE
+capability).
 .SH CONFORMING TO
 SVr4, POSIX.1-2001.
 .\" SVID does not document the EIDRM error condition.
@@ -357,3 +371,12 @@ flag in
 .BR capabilities (7),
 .BR mq_overview (7),
 .BR svipc (7)
+.SH COLOPHON
+This page is part of release 3.68 of the Linux
+.I man-pages
+project.
+A description of the project,
+information about reporting bugs,
+and the latest version of this page,
+can be found at
+\%http://www.kernel.org/doc/man\-pages/.