documenting USE_VALIDATION_AGENT in configuration

diff --git a/etc/monkeysphere.conf b/etc/monkeysphere.conf
index 53adf83e65d16cd282942a6c43b44a8c90efeba9..3a06e8a5515f743ba7bb9e63eb7e93e72a54a5b1 100644 (file)
--- a/etc/monkeysphere.conf
+++ b/etc/monkeysphere.conf
@@ -36,3 +36,7 @@
 
 # The path to the SSH authorized_keys file.
 #AUTHORIZED_KEYS=~/.ssh/authorized_keys
+
+# Set to true to enable validation agent during X session startup
+# where available.
+#USE_VALIDATION_AGENT=false

diff --git a/packaging/debian/70monkeysphere_use_validation_agent b/packaging/debian/70monkeysphere_use_validation_agent
index 7c7a0304d54d3ac14d41d6d6ce1b78348c64bd9e..1335458ce0bc812bb829415b6f29b3d1a6ceaa1a 100644 (file)
--- a/packaging/debian/70monkeysphere_use_validation_agent
+++ b/packaging/debian/70monkeysphere_use_validation_agent
@@ -26,10 +26,10 @@ MSSYSCONFIG=/etc/monkeysphere/monkeysphere.conf
 MSUSERCONFIG="$HOME/.monkeysphere/monkeysphere.conf"
 
 if [ -x "$MSVAGENT" ] ; then
-    USEMSVAGENT=$(sh -c "
+    USEMSVAGENT=$(sh -c "USE_VALIDATION_AGENT=
 . '$MSSYSCONFIG' 2>/dev/null
 . '$MSUSERCONFIG' 2>/dev/null || :
-printf '%s' "'"$MONKEYSPHERE_USE_VALIDATION_AGENT"')
+printf '%s' "'"$USE_VALIDATION_AGENT"')
     
     if [ "$USEMSVAGENT" == "true" ] ; then
         STARTUP="$MSVAGENT $STARTUP"