Merge branch 'master' of openslx.org:pvs

Conflicts:
	CMakeLists.txt
	src/core/pvsConnectionManager.cpp
	src/pvs.cpp
	src/pvs.h

1 files changed, 28 insertions, 0 deletions

diff --git a/src/input/pvsprivinputd.conf b/src/input/pvsprivinputd.conf
new file mode 100644
index 0000000..a62a922
--- /dev/null
+++ b/src/input/pvsprivinputd.conf
@@ -0,0 +1,28 @@
+;; Lines starting with `;' are comments.
+;;
+;; socketpath: 
+;;   Where pvsprivinputd should put its listening socket.
+socketpath = /tmp/pvsprivinputd.sock
+
+;; privileged-users:
+;;   Comma-separated list of users that are allowed to run privileged actions
+privileged-users = root
+
+;; privileged-groups:
+;;   Comma-separated list of user groups that are allowed to run privileged actions
+; privileged-groups = wheel
+ 
+;; assume-session-local:
+;;   Assume that a session is local if it can not be looked up in ConsoleKit,
+;;   for example, if you are not running ConsoleKit.
+;;
+;;   WARNING: Setting this to true may be a security risk. Running ConsoleKit is
+;;   really recommended.
+; assume-session-local = false
+
+;; assume-user-privileged:
+;;   Assume that a user is privileged if he/she can not be looked up in
+;;   the user database or PolicyKit fails to deliver an answer.
+;;
+;;   WARNING: Setting this to true is most definitely a security risk.
+; assume-user-privileged = false
\ No newline at end of file