Changeset 88

Timestamp:

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

Author:

alloc

Message:

v.32 hotfix: Allow empty Telnet password

Files:

• binary-improvements/NamePatcher/NamePatcher.userprefs (modified) (1 diff)
• scripts/usr/local/lib/7dtd/common.sh (modified) (3 diffs)
• scripts/usr/local/lib/7dtd/serverconfig.sh (modified) (2 diffs)

binary-improvements/NamePatcher/NamePatcher.userprefs

@@ -3 +3 @@
   <MonoDevelop.Ide.Workbench ActiveDocument="NamePatcher.cs">
     <Files>
-      <File FileName="NamePatcher.cs" Line="98" Column="5" />
+      <File FileName="NamePatcher.cs" Line="175" Column="34" />
       <File FileName="NameNormalizer.cs" Line="188" Column="1" />
     </Files>

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
 }

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

@@ -364 +364 @@
 serverconfig_TelnetPassword_Type() {
         echo "string"
-}
-serverconfig_TelnetPassword_Validate() {
-        if [ -z $1 ]; then
-                echo "0"
-        else
-                echo "1"
-        fi
-}
-serverconfig_TelnetPassword_ErrorMessage() {
-        echo "Telnet must have a password set to function."
 }
 
@@ -740 +730 @@
                         echo
                         echo "NOTE: Telnet will always be enabled for management purposes!"
-                        echo "Make sure you block external access to this port!"
+                        echo "Make sure you block external access to this port or set no password"
+                        echo "so the server will only listen on the loopback interface!"
                         echo
                 fi