Add icesecret .ini parameter to "protect" local Ice connections

1 files changed, 7 insertions, 10 deletions

diff --git a/scripts/murmur.ini b/scripts/murmur.ini
index 65178ac24..d454223f9 100644
--- a/scripts/murmur.ini
+++ b/scripts/murmur.ini
@@ -24,13 +24,19 @@ dbus=session
 # murmurd processes connected to the same D-Bus daemon.
 #dbusservice=net.sourceforge.mumble.murmur
 
-# If you want to use ZeroC ICE to communicate with Murmur, you need
+# If you want to use ZeroC Ice to communicate with Murmur, you need
 # to specify the endpoint to use. Since there is no authentication
 # with ICE, you should only use it if you trust all the users who have
 # shell access to your machine.
 # Please see the ICE documentation on how to specify endpoints.
 #ice="tcp -h 127.0.0.1 -p 6502"
 
+# Ice primarily uses local sockets. This means anyone who has a
+# user account on your machine can connect to the Ice services.
+# You can set a plaintext "secret" on the Ice conntection, and
+# any script attempting to access must then have this secret.
+#icesecret=
+
 # How many login attempts do we tolerate from one IP
 # inside a given timeframe before we ban the connection?
 # Note that this is global (shared between all virtual servers), and that
@@ -115,15 +121,6 @@ users=100
 #sslCert=
 #sslKey=
 
-# To enable username registration through
-# http://webserver/cgi-bin/mumble-server/register.cgi
-# then this value must be set to a valid email
-# and you must be running a SMTP server on this
-# machine.
-# This option is only used for a pre-packaged system-wide installation,
-# and does nothing if you just start murmurd yourself.
-#emailfrom=
-
 # If murmur is started as root, which user should it switch to?
 # This option is ignored if murmur isn't started with root privileges.
 #uname=