2009-04-20 Dave Brolley <brolley@redhat.com>

	* main.cxx (main): Turn of guru_mode if --unprivileged is specified and
	vice-versa.
	* elaborate.h (unprivileged_whitelist): New member of match_node.
	* elaborate.cxx (match_node::match_node): Initialize unprivileged_whitelist.
	(match_node::find_and_build): In --unprivileged mode, throw a
	semantic_error for probe components which are not in
	uinprivileged_whitelist.

1 files changed, 2 insertions, 0 deletions

diff --git a/main.cxx b/main.cxx
index c9f855c8..d367232d 100644
--- a/main.cxx
+++ b/main.cxx
@@ -610,6 +610,7 @@ main (int argc, char * const argv [])
 
         case 'g':
           s.guru_mode = true;
+	  s.unprivileged = false;
           break;
 
         case 'P':
@@ -752,6 +753,7 @@ main (int argc, char * const argv [])
 	      break;
 	    case LONG_OPT_UNPRIVILEGED:
 	      s.unprivileged = true;
+	      s.guru_mode = false;
 	      break;
             default:
               cerr << "Internal error parsing command arguments." << endl;