cdown / rpms / util-linux

Forked from rpms/util-linux 2 years ago
Clone
531551
From a04fe4b347e563d7ff8d116fde6c6f26646ffadd Mon Sep 17 00:00:00 2001
531551
From: Hushan Jia <hushan.jia@gmail.com>
531551
Date: Sun, 21 Feb 2016 21:10:24 -0800
531551
Subject: [PATCH 102/116] ipcs: show gid instead of uid
531551
531551
ipcs -i incorrectly used uid where it should be gid
531551
531551
Upstream: https://github.com/karelzak/util-linux/commit/e0bbe3d6ffed13ca5e4af450b8de775ddc5b30f3
531551
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1358095
531551
Signed-off-by: Hushan Jia <hushan.jia@gmail.com>
531551
---
531551
 sys-utils/ipcs.c | 6 +++---
531551
 1 file changed, 3 insertions(+), 3 deletions(-)
531551
531551
diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c
531551
index 1843cd5..1db7fd0 100644
531551
--- a/sys-utils/ipcs.c
531551
+++ b/sys-utils/ipcs.c
531551
@@ -564,7 +564,7 @@ static void print_shm(int shmid, int unit)
531551
 
531551
 	printf(_("\nShared memory Segment shmid=%d\n"), shmid);
531551
 	printf(_("uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"),
531551
-	       shmdata->shm_perm.uid, shmdata->shm_perm.uid,
531551
+	       shmdata->shm_perm.uid, shmdata->shm_perm.gid,
531551
 	       shmdata->shm_perm.cuid, shmdata->shm_perm.cgid);
531551
 	printf(_("mode=%#o\taccess_perms=%#o\n"), shmdata->shm_perm.mode,
531551
 	       shmdata->shm_perm.mode & 0777);
531551
@@ -594,7 +594,7 @@ void print_msg(int msgid, int unit)
531551
 
531551
 	printf(_("\nMessage Queue msqid=%d\n"), msgid);
531551
 	printf(_("uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"),
531551
-	       msgdata->msg_perm.uid, msgdata->msg_perm.uid,
531551
+	       msgdata->msg_perm.uid, msgdata->msg_perm.gid,
531551
 	       msgdata->msg_perm.cuid, msgdata->msg_perm.cgid,
531551
 	       msgdata->msg_perm.mode);
531551
 	ipc_print_size(unit, unit == IPC_UNIT_HUMAN ? _("csize=") : _("cbytes="),
531551
@@ -627,7 +627,7 @@ static void print_sem(int semid)
531551
 
531551
 	printf(_("\nSemaphore Array semid=%d\n"), semid);
531551
 	printf(_("uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"),
531551
-	       semdata->sem_perm.uid, semdata->sem_perm.uid,
531551
+	       semdata->sem_perm.uid, semdata->sem_perm.gid,
531551
 	       semdata->sem_perm.cuid, semdata->sem_perm.cgid);
531551
 	printf(_("mode=%#o, access_perms=%#o\n"),
531551
 	       semdata->sem_perm.mode, semdata->sem_perm.mode & 0777);
531551
-- 
531551
2.9.3
531551