Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://github.com/woju/qubes-core-agent-linux

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2015-03-31 22:25:23 +02:00
commit 5c3ab559c6
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
misc/qubes.sudoers
View File

@ -1,3 +1,4 @@
Defaults !requiretty
user ALL=(ALL) NOPASSWD: ALL user ALL=(ALL) NOPASSWD: ALL
# WTF?! Have you lost your mind?! # WTF?! Have you lost your mind?!
@ -44,3 +45,5 @@ user ALL=(ALL) NOPASSWD: ALL
# be seen by the xinput program...) # be seen by the xinput program...)
# #
# joanna. # joanna.
# vim: ft=sudoers

18
qrexec/qubes-rpc-multiplexer
View File

@ -6,23 +6,19 @@ exec 2>/tmp/qrexec-rpc-stderr.$$
rm -f /tmp/qrexec-rpc-stderr.$$ rm -f /tmp/qrexec-rpc-stderr.$$
QUBES_RPC=/etc/qubes-rpc QUBES_RPC=/etc/qubes-rpc
# XXX: Backward compatibility LOCAL_QUBES_RPC=/usr/local/etc/qubes-rpc
DEPRECATED_QUBES_RPC=/etc/qubes_rpc
if ! [ $# = 2 ] ; then if ! [ $# = 2 ] ; then
echo $0: bad argument count, usage: $0 SERVICE-NAME REMOTE-DOMAIN-NAME >&2 echo $0: bad argument count, usage: $0 SERVICE-NAME REMOTE-DOMAIN-NAME >&2
exit 1 exit 1
fi fi
export QREXEC_REMOTE_DOMAIN="$2" export QREXEC_REMOTE_DOMAIN="$2"
if [ -s "$QUBES_RPC/$1" ]; then for CFG_FILE in $QUBES_RPC/"$1" $LOCAL_QUBES_RPC/"$1"; do
CFG_FILE=$QUBES_RPC/"$1" if [ -s "$CFG_FILE" ]; then
elif [ -s "$DEPRECATED_QUBES_RPC/$1" ]; then break
echo "$0: RPC service '$1' uses deprecated directory, please move to $QUBES_RPC" >&2 fi
CFG_FILE=$DEPRECATED_QUBES_RPC/"$1" done
else
echo "$0: Cannot find service $1 file in $QUBES_RPC" >&2
exit 1
fi
if [ -x "$CFG_FILE" ] ; then if [ -x "$CFG_FILE" ] ; then
exec "$CFG_FILE" exec "$CFG_FILE"