From a18a40d0cf1408d5575165ebc4374a1ab4f9fbc0 Mon Sep 17 00:00:00 2001
From: Dave Brolley <brolley@redhat.com>
Date: Fri, 18 Dec 2009 12:16:33 -0500
Subject: PR 10641: Do not allow -m when --unprivileged in the server.

---
 stap-server | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'stap-server')

diff --git a/stap-server b/stap-server
index d69119db..9e30a121 100755
--- a/stap-server
+++ b/stap-server
@@ -285,7 +285,11 @@ function parse_options {
 		    ;;
 		m)
 		    get_arg $first_token $2
-		    stap_options="$stap_options -$first_char $stap_arg"
+		    if test $unprivileged = 1; then
+			fatal "You can't specify -$first_char and --unprivileged together."
+		    else
+			stap_options="$stap_options -$first_char $stap_arg"
+		    fi
 		    ;;
 		o)
 		    get_arg $first_token $2
-- 
cgit