[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-187-g17f476a

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


commit 17f476a91f604b0307eb4fdb9498d352457909fe
Author: Mats Erik Andersson <address@hidden>
Date:   Thu Oct 11 02:55:46 2012 +0200

    rlogind: Protect code blocks for Kerberos.

diff --git a/ChangeLog b/ChangeLog
index 6f34b80..3d49088 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2012-10-11  Mats Erik Andersson  <address@hidden>
 
+       * src/rlogind.c (rlogin_daemon)
+       [(KERBEROS || SHISHI) && ENCRYPTION]: Protect
+       encrypted port pre-selection.
+       [(KERBEROS || SHISHI) && !ENCRYPTION]: Protect
+       standard Kerberos port pre-selection.
+
+2012-10-11  Mats Erik Andersson  <address@hidden>
+
        telnetd: Set local name correctly for libshishi.
        Improve selectivity of intended server host key.
 
diff --git a/src/rlogind.c b/src/rlogind.c
index 7e8b113..064cc50 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -656,21 +656,26 @@ rlogin_daemon (int maxchildren, int port)
       char *service;
       struct servent *svp;
 
+#if defined KERBEROS || defined SHISHI
+# ifdef ENCRYPTION
       if (kerberos && encrypt_io)
        {
          service = "eklogin";
          port = DEFPORT_EKLOGIN;
        }
-      else if (kerberos)
-       {
-         service = "klogin";
-         port = DEFPORT_KLOGIN;
-       }
       else
-       {
-         service = "login";
-         port = DEFPORT;
-       }
+# endif /* ENCRYPTION */
+       if (kerberos)
+         {
+           service = "klogin";
+           port = DEFPORT_KLOGIN;
+         }
+       else
+#endif /* KERBEROS || SHISHI */
+         {
+           service = "login";
+           port = DEFPORT;
+         }
 
       svp = getservbyname (service, "tcp");
       if (svp != NULL)

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

Summary of changes:
 ChangeLog     |    8 ++++++++
 src/rlogind.c |   23 ++++++++++++++---------
 2 files changed, 22 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GNU Inetutils