Revert "multi: Further reduce optional feature set."

This reverts commit 7368068.

Author: johnsonjh

Diff for: telnet/commands.c

@@ -1888,7 +1888,7 @@ env_init (void)
   extern char *strchr (const char *, int);
 #endif
 
-/*  for (epp = environ; *epp; epp++)
+  for (epp = environ; *epp; epp++)
     {
       cp = strchr (*epp, '=');
       if (cp)
@@ -1898,13 +1898,13 @@ env_init (void)
 	  ep->export = 0;
 	  *cp = '=';
 	}
-    }*/
+    }
   /*
    * Special case for DISPLAY variable.  If it is ":0.0" or
    * "unix:0.0", we have to get rid of "unix" and insert our
    * hostname.
    */
-/*  if ((ep = env_find ("DISPLAY"))
+  if ((ep = env_find ("DISPLAY"))
       && ((*ep->value == ':')
 	  || (strncmp ((char *) ep->value, "unix:", 5) == 0)))
     {
@@ -1918,19 +1918,19 @@ env_init (void)
       ep->value = (unsigned char *) cp;
 
       free (hostname);
-    }*/
+    }
   /*
    * If USER is not defined, but LOGNAME is, then add
    * USER with the value from LOGNAME.  By default, we
    * don't export the USER variable.
    */
-/*  if ((env_find ("USER") == NULL) && (ep = env_find ("LOGNAME")))
+  if ((env_find ("USER") == NULL) && (ep = env_find ("LOGNAME")))
     {
       env_define ("USER", ep->value);
       env_unexport ("USER");
     }
   env_export ("DISPLAY");
-  env_export ("PRINTER"); */
+  env_export ("PRINTER");
 }
 
 struct env_lst *

Diff for: telnetd/slc.c

@@ -188,13 +188,13 @@ add_slc (register char func, register char flag, register cc_t val)
 void
 start_slc (register int getit)
 {
-/*
+
   slcchange = 0;
   if (getit)
     init_termbuf ();
   sprintf ((char *) slcbuf, "%c%c%c%c", IAC, SB, TELOPT_LINEMODE, LM_SLC);
   slcptr = slcbuf + 4;
-*/
+
 }				/* end of start_slc */
 
 /*
@@ -222,7 +222,7 @@ end_slc (register unsigned char **bufp)
    * deferred slc request from the client, then do not send any
    * sort of slc negotiation now.  We will respond to the client's
    * request very soon.
-   */ /*
+   */
   if (def_slcbuf && (terminit () == 0))
     {
       return (0);
@@ -241,10 +241,10 @@ end_slc (register unsigned char **bufp)
 	  slcptr += 2;
 	  len = slcptr - slcbuf;
 	  net_output_datalen (slcbuf, len);
-	  netflush (); */		/* force it out immediately */
-/*	  DEBUG (debug_options, 1, printsub ('>', slcbuf + 2, len - 2));
+	  netflush ();		/* force it out immediately */
+	  DEBUG (debug_options, 1, printsub ('>', slcbuf + 2, len - 2));
 	}
-    } */
+    }
   return (0);
 
 }				/* end of end_slc */

Diff for: telnetd/termstat.c

@@ -268,7 +268,7 @@ localstat (void)
 	send_will (TELOPT_SGA, 1);
       send_will (TELOPT_ECHO, 1);
       linemode = uselinemode;
-//      goto done;
+      goto done;
     }
 
   /*
@@ -299,7 +299,7 @@ localstat (void)
    * Negotiate linemode on if pty state has changed to turn it on.
    * Send appropriate command and send along edit mode, then all done.
    */
-/*  if (uselinemode && !linemode)
+  if (uselinemode && !linemode)
     {
       if (lmodetype == KLUDGE_LINEMODE)
 	{
@@ -310,6 +310,7 @@ localstat (void)
 	  char data[8];
 
 	  send_do (TELOPT_LINEMODE, 1);
+	  /* send along edit modes */
 	  sprintf (data, "%c%c%c%c%c%c%c",
 		   IAC, SB, TELOPT_LINEMODE,
 		   LM_MODE, useeditmode,
@@ -323,27 +324,27 @@ localstat (void)
       linemode = uselinemode;
       goto done;
     }
-*/
+
   /*
    * None of what follows is of any value if not using
    * real linemode.
    */
-//  if (lmodetype < REAL_LINEMODE)
-  //  goto done;
+  if (lmodetype < REAL_LINEMODE)
+    goto done;
 
-//  if (linemode && his_state_is_will (TELOPT_LINEMODE))
- //   {
+  if (linemode && his_state_is_will (TELOPT_LINEMODE))
+    {
       /*
        * If edit mode changed, send edit mode.
        */
-  //    if (useeditmode != editmode)
-//	{
+      if (useeditmode != editmode)
+	{
 	  /*
 	   * Send along appropriate edit mode mask.
 	   */
-	//  char data[8];
+	  char data[8];
 
-/*	  sprintf (data, "%c%c%c%c%c%c%c",
+	  sprintf (data, "%c%c%c%c%c%c%c",
 		   IAC, SB, TELOPT_LINEMODE,
 		   LM_MODE, useeditmode,
 		   IAC, SE);
@@ -353,19 +354,19 @@ localstat (void)
 
 	  editmode = useeditmode;
 	}
-*/
+
 
       /*
        * Check for changes to special characters in use.
        */
-  //    start_slc (0);
-    //  check_slc ();
-    //  end_slc (0);
-   // }
-
-//done:
- // if (need_will_echo)
-  //  send_will (TELOPT_ECHO, 1);
+      start_slc (0);
+      check_slc ();
+      end_slc (0);
+    }
+
+done:
+  if (need_will_echo)
+    send_will (TELOPT_ECHO, 1);
   /*
    * Some things should be deferred until after the pty state has
    * been set by the local process.  Do those things that have been
@@ -478,7 +479,7 @@ clientstat (register int code, register int parm1, register int parm2)
 	  if (lmodetype == REAL_LINEMODE && uselinemode)
 	    if (uselinemode)
 	      {
-/*		char data[8];
+		char data[8];
 
 		useeditmode = 0;
 		if (tty_isediting ())
@@ -498,7 +499,7 @@ clientstat (register int code, register int parm1, register int parm2)
 		DEBUG (debug_options, 1,
 		       printsub ('>', data + 2, sizeof (data) - 2));
 
-		editmode = useeditmode; */
+		editmode = useeditmode;
 	      }
 
 
@@ -557,13 +558,13 @@ clientstat (register int code, register int parm1, register int parm2)
 	      {
 		char data[8];
 
-/*		sprintf (data, "%c%c%c%c%c%c%c",
+		sprintf (data, "%c%c%c%c%c%c%c",
 			 IAC, SB, TELOPT_LINEMODE,
 			 LM_MODE, useeditmode | MODE_ACK,
 			 IAC, SE);
 		net_output_datalen (data, sizeof (data));
 		DEBUG (debug_options, 1,
-		       printsub ('>', data + 2, sizeof (data) - 2)); */
+		       printsub ('>', data + 2, sizeof (data) - 2));
 	      }
 
 	    editmode = useeditmode;