[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_2-44-geaea8e1

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  eaea8e167f7909ca3bb399f88f08503ea1d59917 (commit)
      from  d3c9b1b8fa470b91fc62de58fc5b94c2daa9b57c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=eaea8e167f7909ca3bb399f88f08503ea1d59917


commit eaea8e167f7909ca3bb399f88f08503ea1d59917
Author: Mats Erik Andersson <address@hidden>
Date:   Sat Jan 17 02:01:16 2015 +0100

    telnetd: Inherited mistakes in legacy code.

diff --git a/ChangeLog b/ChangeLog
index a966ac6..44780e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2015-01-17  Mats Erik Andersson  <address@hidden>
+
+       * telnetd/state.c (dooption) : Remove outdated and misnamed
+       ifdef on TELOPT_ENVIRON.
+       (suboption): Remove outdated ifdef on TELOPT_NEW_ENVIRON.
+       (send_status) <DEBUG>: Pass only the suboption payload into
+       printsub(), by stepping over IAC+SB in the string buffer.
+       * telnetd/utility.c (printsub) <default>: When an unexpected
+       mode must be reported numerically, print the correct byte in
+       pointer[0], not some other pseudo-random value.
+
 2014-11-11  Mats Erik Andersson  <address@hidden>
 
        * bootstrap: Updated from gnulib.
diff --git a/telnetd/state.c b/telnetd/state.c
index 3ce6e1b..2184bca 100644
--- a/telnetd/state.c
+++ b/telnetd/state.c
@@ -1015,9 +1015,7 @@ dooption (int option)
        case TELOPT_TSPEED:
        case TELOPT_LFLOW:
        case TELOPT_XDISPLOC:
-#ifdef TELOPT_ENVIRON
        case TELOPT_NEW_ENVIRON:
-#endif
        case TELOPT_OLD_ENVIRON:
        default:
          break;
@@ -1317,9 +1315,7 @@ suboption (void)
        break;
       }                                /* end of case TELOPT_XDISPLOC */
 
-#ifdef TELOPT_NEW_ENVIRON
     case TELOPT_NEW_ENVIRON:
-#endif
     case TELOPT_OLD_ENVIRON:
       {
        register int c;
@@ -1338,7 +1334,6 @@ suboption (void)
        else if (c != TELQUAL_INFO)
          return;
 
-#ifdef TELOPT_NEW_ENVIRON
        if (subchar == TELOPT_NEW_ENVIRON)
          {
            while (!SB_EOF ())
@@ -1349,7 +1344,6 @@ suboption (void)
              }
          }
        else
-#endif
          {
 #ifdef ENV_HACK
            /*
@@ -1702,7 +1696,9 @@ send_status (void)
   net_output_datalen (statusbuf, ncp - statusbuf);
   netflush ();                 /* Send it on its way */
 
-  DEBUG (debug_options, 1, printsub ('>', statusbuf, ncp - statusbuf));
+  /* Step over the initial IAC+SB, into suboption payload.  */
+  DEBUG (debug_options, 1, printsub ('>', statusbuf + 2,
+                                    ncp - statusbuf - 2));
   return;
 
 trunc:
diff --git a/telnetd/utility.c b/telnetd/utility.c
index a78a2a8..0a4d430 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -1559,7 +1559,7 @@ printsub (int direction, unsigned char *pointer, int 
length)
       if (TELOPT_OK (pointer[0]))
        debug_output_data ("%s (unknown)", TELOPT (pointer[0]));
       else
-       debug_output_data ("%d (unknown)", pointer[i]);
+       debug_output_data ("%d (unknown)", pointer[0]);
       for (i = 1; i < length; i++)
        debug_output_data (" %d", pointer[i]);
       break;

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |   11 +++++++++++
 telnetd/state.c   |   10 +++-------
 telnetd/utility.c |    2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
GNU Inetutils