[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-188-g48c58b1

[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  48c58b140e5eb42dc2ea831d65eb516cae320b62 (commit)
      from  17f476a91f604b0307eb4fdb9498d352457909fe (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=48c58b140e5eb42dc2ea831d65eb516cae320b62


commit 48c58b140e5eb42dc2ea831d65eb516cae320b62
Author: Mats Erik Andersson <address@hidden>
Date:   Thu Oct 11 13:12:18 2012 +0200

    rlogin: Urgent data handling.

diff --git a/ChangeLog b/ChangeLog
index 3d49088..75a8674 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2012-10-11  Mats Erik Andersson  <address@hidden>
 
+       rlogin: Read urgent data also when Kerberos has
+       been disabled.  Needed for window sizing.
+
+       * src/rlogin.c (sigwinch): Call get_window_size()
+       with STDIN_FILENO as file descriptor.
+       (oob) [SHISHI]: Receive MSG_OOB data whenever
+       `!use_kerberos' is true.
+
+2012-10-11  Mats Erik Andersson  <address@hidden>
+
        * src/rlogind.c (rlogin_daemon)
        [(KERBEROS || SHISHI) && ENCRYPTION]: Protect
        encrypted port pre-selection.
diff --git a/src/rlogin.c b/src/rlogin.c
index 9a7c483..6d0c0fc 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -1111,7 +1111,7 @@ sigwinch (int signo _GL_UNUSED_PARAMETER)
 {
   struct winsize ws;
 
-  if (dosigwinch && get_window_size (0, &ws) == 0
+  if (dosigwinch && get_window_size (STDIN_FILENO, &ws) == 0
       && memcmp (&ws, &winsize, sizeof ws))
     {
       winsize = ws;
@@ -1176,36 +1176,38 @@ oob (int signo _GL_UNUSED_PARAMETER)
   out = O_RDWR;
   rcvd = 0;
 
-#ifndef SHISHI
-  while (recv (rem, &mark, 1, MSG_OOB) < 0)
-    {
-      switch (errno)
-       {
-       case EWOULDBLOCK:
-         /*
-          * Urgent data not here yet.  It may not be possible
-          * to send it yet if we are blocked for output and
-          * our input buffer is full.
-          */
-         if ((size_t) rcvcnt < sizeof rcvbuf)
-           {
-             n = read (rem, rcvbuf + rcvcnt, sizeof (rcvbuf) - rcvcnt);
-             if (n <= 0)
-               return;
-             rcvd += n;
-           }
-         else
-           {
-             n = read (rem, waste, sizeof waste);
-             if (n <= 0)
-               return;
-           }
-         continue;
-       default:
-         return;
-       }
-    }
+#ifdef SHISHI
+  if (!use_kerberos)
 #endif
+    while (recv (rem, &mark, 1, MSG_OOB) < 0)
+      {
+       switch (errno)
+         {
+         case EWOULDBLOCK:
+           /*
+            * Urgent data not here yet.  It may not be possible
+            * to send it yet if we are blocked for output and
+            * our input buffer is full.
+            */
+           if ((size_t) rcvcnt < sizeof rcvbuf)
+             {
+               n = read (rem, rcvbuf + rcvcnt, sizeof (rcvbuf) - rcvcnt);
+               if (n <= 0)
+                 return;
+               rcvd += n;
+             }
+           else
+             {
+               n = read (rem, waste, sizeof waste);
+               if (n <= 0)
+                 return;
+             }
+           continue;
+         default:
+           return;
+         }
+      }
+
   if (mark & TIOCPKT_WINDOW)
     {
       /* Let server know about window size changes */
@@ -1346,6 +1348,7 @@ reader (sigset_t * osmask)
        }
     }
 }
+
 void
 mode (int f)
 {

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

Summary of changes:
 ChangeLog    |   10 +++++++++
 src/rlogin.c |   63 ++++++++++++++++++++++++++++++---------------------------
 2 files changed, 43 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
GNU Inetutils