[sedwards] 40485: add telnet service, enable it by default

Author: sedwards
Date: Mon Apr 13 20:26:49 2009
New Revision: 40485

URL: http://svn.reactos.org/svn/reactos?rev=40485&view=rev
Log:
add telnet service, enable it by default

Modified:
    trunk/reactos/base/services/services.rbuild
    trunk/reactos/base/services/telnetd/serviceentry.c
    trunk/reactos/base/services/telnetd/telnetd.c
    trunk/reactos/base/services/telnetd/telnetd.rbuild
    trunk/reactos/boot/bootdata/hivesys_i386.inf
    trunk/reactos/boot/bootdata/packages/reactos.dff

Modified: trunk/reactos/base/services/services.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/services.rbui...
==============================================================================
--- trunk/reactos/base/services/services.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/services/services.rbuild [iso-8859-1] Mon Apr 13 20:26:49 2009
@@ -22,6 +22,9 @@
    <directory name="tcpsvcs">
    	<xi:include href="tcpsvcs/tcpsvcs.rbuild" />
    </directory>
+	<directory name="telnetd">
+		<xi:include href="telnetd/telnetd.rbuild" />
+	</directory>
    <directory name="umpnpmgr">
    	<xi:include href="umpnpmgr/umpnpmgr.rbuild" />
    </directory>

Modified: trunk/reactos/base/services/telnetd/serviceentry.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/telnetd/servi...
==============================================================================
--- trunk/reactos/base/services/telnetd/serviceentry.c [iso-8859-1] (original)
+++ trunk/reactos/base/services/telnetd/serviceentry.c [iso-8859-1] Mon Apr 13 20:26:49 2009
@@ -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 <windows.h>
+#include "wine/debug.h"

-#define WINE_FIXME printf
-#define WINE_TRACE printf
+WINE_DEFAULT_DEBUG_CHANNEL(telnetd);

-//#include "wine/debug.h"
-
-//WINE_DEFAULT_DEBUG_CHANNEL(spoolsv);
-
-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 @@
     StartServiceCtrlDispatcherW(servtbl);
     return 0;
 }
-#endif
 /* EOF */

Modified: trunk/reactos/base/services/telnetd/telnetd.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/telnetd/telne...
==============================================================================
--- trunk/reactos/base/services/telnetd/telnetd.c [iso-8859-1] (original)
+++ trunk/reactos/base/services/telnetd/telnetd.c [iso-8859-1] Mon Apr 13 20:26:49 2009
@@ -45,7 +45,7 @@
  * rename this function
  * int kickoff_telnetd(void)
  */
-int main(int argc, char **argv)
+int kickoff_telnetd(void)
 {
   printf("Attempting to start Simple TelnetD\n");

Modified: trunk/reactos/base/services/telnetd/telnetd.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/telnetd/telne...
==============================================================================
--- trunk/reactos/base/services/telnetd/telnetd.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/services/telnetd/telnetd.rbuild [iso-8859-1] Mon Apr 13 20:26:49 2009
@@ -6,6 +6,7 @@
    <library>kernel32</library>
    <library>advapi32</library>
    <library>ws2_32</library>
+	<library>wine</library>

<file>telnetd.c</file>
    <file>serviceentry.c</file>

Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386....
==============================================================================
--- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Mon Apr 13 20:26:49 2009
@@ -1061,6 +1061,15 @@
 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

Modified: trunk/reactos/boot/bootdata/packages/reactos.dff
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/reac...
==============================================================================
--- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Apr 13 20:26:49 2009
@@ -90,6 +90,7 @@
 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