From 8ad7700db8096f5b698a617e69de40cecab7fe3a Mon Sep 17 00:00:00 2001 From: Steven Edwards Date: Mon, 13 Apr 2009 16:26:49 +0000 Subject: [PATCH] add telnet service, enable it by default svn path=/trunk/; revision=40485 --- reactos/base/services/services.rbuild | 3 +++ reactos/base/services/telnetd/serviceentry.c | 13 ++++--------- reactos/base/services/telnetd/telnetd.c | 2 +- reactos/base/services/telnetd/telnetd.rbuild | 1 + reactos/boot/bootdata/hivesys_i386.inf | 9 +++++++++ reactos/boot/bootdata/packages/reactos.dff | 1 + 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/reactos/base/services/services.rbuild b/reactos/base/services/services.rbuild index 3787fddc0e7..a5edc08116b 100644 --- a/reactos/base/services/services.rbuild +++ b/reactos/base/services/services.rbuild @@ -22,6 +22,9 @@ + + + diff --git a/reactos/base/services/telnetd/serviceentry.c b/reactos/base/services/telnetd/serviceentry.c index 015d057d00d..ee17e2a6f75 100644 --- a/reactos/base/services/telnetd/serviceentry.c +++ b/reactos/base/services/telnetd/serviceentry.c @@ -15,19 +15,15 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#if 0 + #define WIN32_LEAN_AND_MEAN #include +#include "wine/debug.h" -#define WINE_FIXME printf -#define WINE_TRACE printf - -//#include "wine/debug.h" - -//WINE_DEFAULT_DEBUG_CHANNEL(spoolsv); +WINE_DEFAULT_DEBUG_CHANNEL(telnetd); -static WCHAR telnetdW[] = {'T','e','l','n','e','t','D',0}; +static WCHAR telnetdW[] = {'t','e','l','n','e','t','d',0}; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event; @@ -106,6 +102,5 @@ int main(int argc, char **argv) StartServiceCtrlDispatcherW(servtbl); return 0; } -#endif /* EOF */ diff --git a/reactos/base/services/telnetd/telnetd.c b/reactos/base/services/telnetd/telnetd.c index 6dbd20ddc2d..6a6d24a6bd5 100644 --- a/reactos/base/services/telnetd/telnetd.c +++ b/reactos/base/services/telnetd/telnetd.c @@ -45,7 +45,7 @@ static int sock; * rename this function * int kickoff_telnetd(void) */ -int main(int argc, char **argv) +int kickoff_telnetd(void) { printf("Attempting to start Simple TelnetD\n"); diff --git a/reactos/base/services/telnetd/telnetd.rbuild b/reactos/base/services/telnetd/telnetd.rbuild index 3f6325a3665..3f6220463ce 100644 --- a/reactos/base/services/telnetd/telnetd.rbuild +++ b/reactos/base/services/telnetd/telnetd.rbuild @@ -6,6 +6,7 @@ kernel32 advapi32 ws2_32 + wine telnetd.c serviceentry.c diff --git a/reactos/boot/bootdata/hivesys_i386.inf b/reactos/boot/bootdata/hivesys_i386.inf index 14c7c7b3a5e..3f70f138c60 100644 --- a/reactos/boot/bootdata/hivesys_i386.inf +++ b/reactos/boot/bootdata/hivesys_i386.inf @@ -1061,6 +1061,15 @@ HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","ImagePath",0x00020000,"%System HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","Type",0x00010001,0x00000020 +; ReactOS Telnet Daemon +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Description",0x00000000,"ReactOS Telnet Daemon" +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","DisplayName",0x00000000,"ReactOS Telnet Daemon" +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Group",0x00000000,"Network" +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","ImagePath",0x00020000,"%SystemRoot%\system32\telnetd.exe" +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Start",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Type",0x00010001,0x00000020 + ; Sound Blaster (NT4) ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Description",0x00000000,"Sound Blaster (NT4)" ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ErrorControl",0x00010001,0x00000001 diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff index 1961332a173..6b306ec33c6 100644 --- a/reactos/boot/bootdata/packages/reactos.dff +++ b/reactos/boot/bootdata/packages/reactos.dff @@ -90,6 +90,7 @@ base\services\eventlog\eventlog.exe 1 base\services\rpcss\rpcss.exe 1 base\services\spoolsv\spoolsv.exe 1 base\services\tcpsvcs\tcpsvcs.exe 1 +base\services\telnetd\telnetd.exe 1 base\services\tcpsvcs\quotes 5 base\services\umpnpmgr\umpnpmgr.exe 1 base\services\wlansvc\wlansvc.exe 1 -- 2.17.1