From 424954c5a1fd9520cc5ed797845206da02e663e4 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Fri, 13 Feb 2009 04:24:00 +0000
Subject: [PATCH] Beginning the renaming of "Telnet Server" to "Terminal
 Server" (since it supports RLogin and SSH in addition to Telnet).

---
 src/sbbs3/ctrl/MainFormUnit.cpp      |  4 ++--
 src/sbbs3/ctrl/MainFormUnit.dfm      | 18 +++++++++---------
 src/sbbs3/ctrl/PropertiesDlgUnit.cpp |  4 ++--
 src/sbbs3/ctrl/PropertiesDlgUnit.dfm |  4 ++--
 src/sbbs3/ctrl/TelnetCfgDlgUnit.dfm  |  8 ++++----
 src/sbbs3/ctrl/TelnetFormUnit.dfm    |  6 +++---
 src/sbbs3/main.cpp                   |  8 ++++----
 src/sbbs3/sbbscon.c                  | 20 ++++++++++----------
 8 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/sbbs3/ctrl/MainFormUnit.cpp b/src/sbbs3/ctrl/MainFormUnit.cpp
index 4b88cc0a65..9850567fbb 100644
--- a/src/sbbs3/ctrl/MainFormUnit.cpp
+++ b/src/sbbs3/ctrl/MainFormUnit.cpp
@@ -1191,8 +1191,8 @@ void __fastcall TMainForm::FormCloseQuery(TObject *Sender, bool &CanClose)
 
     if(TelnetStop->Enabled && !bbsServiceEnabled()) {
      	if(!terminating && TelnetForm->ProgressBar->Position
-	        && Application->MessageBox("Shut down the Telnet Server?"
-        	,"Telnet Server In Use", MB_OKCANCEL)!=IDOK)
+	        && Application->MessageBox("Shut down the Terminal Server?"
+        	,"Terminal Server In Use", MB_OKCANCEL)!=IDOK)
             return;
         TelnetStopExecute(Sender);
 	}
diff --git a/src/sbbs3/ctrl/MainFormUnit.dfm b/src/sbbs3/ctrl/MainFormUnit.dfm
index 9727754fc0..39bd646984 100644
--- a/src/sbbs3/ctrl/MainFormUnit.dfm
+++ b/src/sbbs3/ctrl/MainFormUnit.dfm
@@ -13919,7 +13919,7 @@ object MainForm: TMainForm
       end
     end
     object TelnetMenuItem: TMenuItem
-      Caption = '&Telnet'
+      Caption = '&Terminal'
       object TelnetConfigureMenuItem: TMenuItem
         Action = TelnetConfigure
         Caption = '&Configure'
@@ -14300,7 +14300,7 @@ object MainForm: TMainForm
     Left = 392
     Top = 65533
     object TelnetStart: TAction
-      Hint = 'Start Telnet Server'
+      Hint = 'Start Terminal Server'
       ImageIndex = 0
       OnExecute = TelnetStartExecute
     end
@@ -14308,23 +14308,23 @@ object MainForm: TMainForm
       AutoCheck = True
       Caption = 'Pause'
       Enabled = False
-      Hint = 'Pause Telnet Server Logging'
+      Hint = 'Pause Terminal Server Logging'
       ImageIndex = 67
     end
     object TelnetStop: TAction
       Enabled = False
-      Hint = 'Stop Telnet Server'
+      Hint = 'Stop Terminal Server'
       ImageIndex = 2
       OnExecute = TelnetStopExecute
     end
     object TelnetRecycle: TAction
       Caption = 'Recycle'
-      Hint = 'Recycle Telnet Server'
+      Hint = 'Recycle Terminal Server'
       ImageIndex = 55
       OnExecute = TelnetRecycleExecute
     end
     object TelnetConfigure: TAction
-      Hint = 'Configure Telnet Server'
+      Hint = 'Configure Terminal Server'
       ImageIndex = 4
       OnExecute = TelnetConfigureExecute
     end
@@ -14371,9 +14371,9 @@ object MainForm: TMainForm
     end
     object ViewTelnet: TAction
       AutoCheck = True
-      Caption = '&Telnet Server'
+      Caption = '&Terminal Server'
       Checked = True
-      Hint = 'View Telnet Server Window'
+      Hint = 'View Terminal Server Window'
       ImageIndex = 9
       OnExecute = ViewTelnetExecute
     end
@@ -17135,7 +17135,7 @@ object MainForm: TMainForm
         OnClick = BBSConfigureMenuItemClick
       end
       object ConfigureTelnetTrayMenuItem: TMenuItem
-        Caption = 'Telnet Server'
+        Caption = 'Terminal Server'
         OnClick = TelnetConfigureExecute
       end
       object ConfigureFtpTrayMenuItem: TMenuItem
diff --git a/src/sbbs3/ctrl/PropertiesDlgUnit.cpp b/src/sbbs3/ctrl/PropertiesDlgUnit.cpp
index b6ca5e995b..eedd405604 100644
--- a/src/sbbs3/ctrl/PropertiesDlgUnit.cpp
+++ b/src/sbbs3/ctrl/PropertiesDlgUnit.cpp
@@ -81,7 +81,7 @@ void __fastcall TPropertiesDlg::SourceComboBoxChange(TObject *Sender)
             ExampleEdit->Font=ClientForm->ListView->Font;
         	ExampleEdit->Color=ClientForm->ListView->Color;
             break;
-        case 2: /* Telnet Server Log */
+        case 2: /* Terminal Server Log */
             ExampleEdit->Font=TelnetForm->Log->Font;
         	ExampleEdit->Color=TelnetForm->Log->Color;
             break;
@@ -142,7 +142,7 @@ void __fastcall TPropertiesDlg::ChangeScheme(int target)
             ClientForm->ListView->Font=ExampleEdit->Font;
         	ClientForm->ListView->Color=ExampleEdit->Color;
             break;
-        case 2: /* Telnet Server Log */
+        case 2: /* Terminal Server Log */
             TelnetForm->Log->Font=ExampleEdit->Font;
         	TelnetForm->Log->Color=ExampleEdit->Color;
             break;
diff --git a/src/sbbs3/ctrl/PropertiesDlgUnit.dfm b/src/sbbs3/ctrl/PropertiesDlgUnit.dfm
index 368c6589c3..1ff73d7a55 100644
--- a/src/sbbs3/ctrl/PropertiesDlgUnit.dfm
+++ b/src/sbbs3/ctrl/PropertiesDlgUnit.dfm
@@ -225,7 +225,7 @@ object PropertiesDlg: TPropertiesDlg
         Items.Strings = (
           'Node List'
           'Client List'
-          'Telnet Server Log'
+          'Terminal Server Log'
           'Event Log'
           'FTP Server Log'
           'Mail Server Log'
@@ -277,7 +277,7 @@ object PropertiesDlg: TPropertiesDlg
         Items.Strings = (
           'Node List'
           'Client List'
-          'Telnet Server Log'
+          'Terminal Server Log'
           'Event Log'
           'FTP Server Log'
           'Mail Server Log'
diff --git a/src/sbbs3/ctrl/TelnetCfgDlgUnit.dfm b/src/sbbs3/ctrl/TelnetCfgDlgUnit.dfm
index 5026280c60..a14758a5b8 100644
--- a/src/sbbs3/ctrl/TelnetCfgDlgUnit.dfm
+++ b/src/sbbs3/ctrl/TelnetCfgDlgUnit.dfm
@@ -2,7 +2,7 @@ object TelnetCfgDlg: TTelnetCfgDlg
   Left = 377
   Top = 354
   BorderStyle = bsDialog
-  Caption = 'Telnet Server Configuration'
+  Caption = 'Terminal Server Configuration'
   ClientHeight = 288
   ClientWidth = 352
   Color = clBtnFace
@@ -43,7 +43,7 @@ object TelnetCfgDlg: TTelnetCfgDlg
         Top = 12
         Width = 144
         Height = 24
-        Hint = 'Automatically start Telnet server'
+        Hint = 'Automatically start Terminal server'
         Caption = 'Auto Startup'
         ParentShowHint = False
         ShowHint = True
@@ -54,7 +54,7 @@ object TelnetCfgDlg: TTelnetCfgDlg
         Top = 12
         Width = 48
         Height = 21
-        Hint = 'First node number available for Telnet logins'
+        Hint = 'First node number available for Terminal logins'
         ParentShowHint = False
         ShowHint = True
         TabOrder = 0
@@ -75,7 +75,7 @@ object TelnetCfgDlg: TTelnetCfgDlg
         Top = 44
         Width = 48
         Height = 21
-        Hint = 'Last node number available for Telnet logins'
+        Hint = 'Last node number available for Terminal logins'
         ParentShowHint = False
         ShowHint = True
         TabOrder = 1
diff --git a/src/sbbs3/ctrl/TelnetFormUnit.dfm b/src/sbbs3/ctrl/TelnetFormUnit.dfm
index d9018ee41b..1c4d5d22f7 100644
--- a/src/sbbs3/ctrl/TelnetFormUnit.dfm
+++ b/src/sbbs3/ctrl/TelnetFormUnit.dfm
@@ -3,7 +3,7 @@ object TelnetForm: TTelnetForm
   Top = 641
   Width = 591
   Height = 214
-  Caption = 'Telnet Server'
+  Caption = 'Terminal Server'
   Color = clBtnFace
   UseDockManager = True
   DragKind = dkDock
@@ -86,7 +86,7 @@ object TelnetForm: TTelnetForm
       Top = 0
       Width = 150
       Height = 22
-      Hint = 'Telnet Server Status'
+      Hint = 'Terminal Server Status'
       Align = alClient
       AutoSize = False
       BorderStyle = sbsSunken
@@ -106,7 +106,7 @@ object TelnetForm: TTelnetForm
       Top = 0
       Width = 75
       Height = 22
-      Hint = 'Telnet Server Utilization'
+      Hint = 'Terminal Server Utilization'
       Min = 0
       Max = 100
       Smooth = True
diff --git a/src/sbbs3/main.cpp b/src/sbbs3/main.cpp
index 098a4781a0..65e87eb84d 100644
--- a/src/sbbs3/main.cpp
+++ b/src/sbbs3/main.cpp
@@ -1,6 +1,6 @@
 /* main.cpp */
 
-/* Synchronet main/telnet server thread and related functions */
+/* Synchronet terminal server thread and related functions */
 
 /* $Id$ */
 
@@ -52,7 +52,7 @@
 
 //---------------------------------------------------------------------------
 
-#define TELNET_SERVER "Synchronet Telnet Server"
+#define TELNET_SERVER "Synchronet Terminal Server"
 #define STATUS_WFC	"Listening"
 
 #define TIMEOUT_THREAD_WAIT		60			// Seconds (was 15)
@@ -4868,9 +4868,9 @@ NO_SSH:
 			if(i==0)
 				continue;
 			if(ERROR_VALUE==EINTR)
-				lprintf(LOG_DEBUG,"Telnet Server listening interrupted");
+				lprintf(LOG_DEBUG,"Terminal Server listening interrupted");
 			else if(ERROR_VALUE == ENOTSOCK)
-            	lprintf(LOG_NOTICE,"Telnet Server sockets closed");
+            	lprintf(LOG_NOTICE,"Terminal Server sockets closed");
 			else
 				lprintf(LOG_WARNING,"!ERROR %d selecting sockets",ERROR_VALUE);
 			continue;
diff --git a/src/sbbs3/sbbscon.c b/src/sbbs3/sbbscon.c
index 1f4e5cea08..edd86b83f6 100644
--- a/src/sbbs3/sbbscon.c
+++ b/src/sbbs3/sbbscon.c
@@ -176,18 +176,18 @@ static const char* usage  = "\nusage: %s [[setting] [...]] [path/ini_file]\n"
 							"\tdefaults   show default settings and options\n"
 							"\n"
 							;
-static const char* telnet_usage  = "Telnet server settings:\n\n"
-							"\ttf<node>   set first Telnet node number\n"
-							"\ttl<node>   set last Telnet node number\n"
+static const char* telnet_usage  = "Terminal server settings:\n\n"
+							"\ttf<node>   set first node number\n"
+							"\ttl<node>   set last node number\n"
 							"\ttp<port>   set Telnet server port\n"
 							"\trp<port>   set RLogin server port (and enable RLogin server)\n"
 							"\tr2         use second RLogin name in BSD RLogin\n"
-							"\tto<value>  set Telnet server options value (advanced)\n"
+							"\tto<value>  set Terminal server options value (advanced)\n"
 							"\tta         enable auto-logon via IP address\n"
 							"\ttd         enable Telnet command debug output\n"
 							"\ttc         emabble sysop availability for chat\n"
 							"\ttq         disable QWK events\n"
-							"\tt-         disable Telnet/RLogin server\n"
+							"\tt-         disable Terminal server\n"
 							"\n"
 							;
 static const char* ftp_usage  = "FTP server settings:\n"
@@ -1381,9 +1381,9 @@ int main(int argc, char** argv)
 			printf("Default settings:\n");
 			printf("\n");
 			printf("Telnet server port:\t%u\n",bbs_startup.telnet_port);
-			printf("Telnet first node:\t%u\n",bbs_startup.first_node);
-			printf("Telnet last node:\t%u\n",bbs_startup.last_node);
-			printf("Telnet server options:\t0x%08lX\n",bbs_startup.options);
+			printf("Terminal first node:\t%u\n",bbs_startup.first_node);
+			printf("Terminal last node:\t%u\n",bbs_startup.last_node);
+			printf("Terminal server options:\t0x%08lX\n",bbs_startup.options);
 			printf("FTP server port:\t%u\n",ftp_startup.port);
 			printf("FTP server options:\t0x%08lX\n",ftp_startup.options);
 			printf("Mail SMTP server port:\t%u\n",mail_startup.smtp_port);
@@ -1403,7 +1403,7 @@ int main(int argc, char** argv)
 						SAFECOPY(log_facility,arg++);
 				break;
 #endif
-			case 'T':	/* Telnet settings */
+			case 'T':	/* Terminal server settings */
 				switch(toupper(*(arg++))) {
 					case '-':	
 						run_bbs=FALSE;
@@ -1623,7 +1623,7 @@ int main(int argc, char** argv)
 					case 'S':	/* Services */
 						run_services=FALSE;
 						break;
-					case 'T':	/* Telnet */
+					case 'T':	/* Terminal Server */
 						run_bbs=FALSE;
 						break;
 					case 'E': /* No Events */
-- 
GitLab