Changeset 88 for scripts/usr/local/lib/7dtd/common.sh

Timestamp:

Jul 19, 2014, 2:17:47 PM (10 years ago)

Author:

alloc

Message:

v.32 hotfix: Allow empty Telnet password

File:

• scripts/usr/local/lib/7dtd/common.sh (modified) (3 diffs)

scripts/usr/local/lib/7dtd/common.sh

@@ -188 +188 @@
         local TEL_PORT=$(getConfigValue $1 TelnetPort)
         local TEL_PASS=$(getConfigValue $1 TelnetPassword)      
-        if [ "$TEL_ENABLED" = "true" ] && [ -n "$TEL_PASS" ]; then
+        if [ "$TEL_ENABLED" = "true" ]; then
                 local TEMPFILE=$(mktemp)
                 rm -f $TEMPFILE
@@ -195 +195 @@
                 nc 127.0.0.1 $TEL_PORT <&3 &
                 local NCPID=$!
-                printf "$TEL_PASS\n$2\n" >&3
+                if [ -n "$TEL_PASS" ]; then
+                        printf "$TEL_PASS\n$2\n" >&3
+                else
+                        printf "$2\n" >&3
+                fi
                 sleep ${3:-1}
                 printf "exit\n" >&3
@@ -203 +207 @@
                 rm -f $TEMPFILE
         else
-                echo "Telnet not enabled or no password set."
+                echo "Telnet not enabled."
         fi
 }