From: Karel Zak <kzak@redhat.com>
Date: Thu, 23 Jul 2015 08:36:02 +0000 (+0200)
Subject: lsipc: the default --global is mutually exclusive with -c --id and -t
X-Git-Tag: v2.27-rc1~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f405a5bed6c78080c6a54e389edcb11471d1794;p=thirdparty%2Futil-linux.git

lsipc: the default --global is mutually exclusive with -c --id and -t

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/lsipc.c b/sys-utils/lsipc.c
index 25dd0f3f24..8912c8da4f 100644
--- a/sys-utils/lsipc.c
+++ b/sys-utils/lsipc.c
@@ -1257,9 +1257,11 @@ int main(int argc, char *argv[])
 	}
 
 	/* default is global */
-	if (msg + shm + sem == 0)
+	if (msg + shm + sem == 0) {
 		msg = shm = sem = global = 1;
-
+		if (show_time || show_creat || id)
+			errx(EXIT_FAILURE, _("the --global is mutually exclusive with --creator, --id and --time"));
+	}
 	if (global) {
 		add_column(columns, ncolumns++, COL_RESOURCE);
 		add_column(columns, ncolumns++, COL_DESC);