[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-275-gac310a0

[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  ac310a022cadcf973dda62607186bc67769a6c37 (commit)
      from  2355ddbc4af9a0f6c6f92833763b32fb05d56633 (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=ac310a022cadcf973dda62607186bc67769a6c37


commit ac310a022cadcf973dda62607186bc67769a6c37
Author: Mats Erik Andersson <address@hidden>
Date:   Fri Apr 19 12:28:00 2013 +0200

    rlogind, rshd: Diagnostics with libshishi.

diff --git a/ChangeLog b/ChangeLog
index ff5cfad..b10841a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-04-19  Mats Erik Andersson  <address@hidden>
+
+       rlogind, rshd: Diagnostics with libshishi.
+
+       * src/rlogind.c (do_shishi_login) [SHISHI && WITH_PAM]:
+       Assign an error message when do_pam_check() fails.
+       * src/rshd.c (doit) [SHISHI && !ENCRYPTION]:
+       Abort with an error message when encryption was requested
+       by the client, but is not present in the server.
+
 2013-04-17  Mats Erik Andersson  <address@hidden>
 
        rlogind, rshd: Set realm with Kerberos5.
diff --git a/src/rlogind.c b/src/rlogind.c
index 066679d..19525e4 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -1723,7 +1723,10 @@ do_shishi_login (int infd, struct auth_data *ad, const 
char **err_msg)
 #  ifdef WITH_PAM
   rc = do_pam_check (infd, ad, "krlogin");
   if (rc != PAM_SUCCESS)
-    return rc;
+    {
+      *err_msg = "Permission denied";
+      return rc;
+    }
 #  endif /* WITH_PAM */
 
   syslog (LOG_INFO | LOG_AUTH,
@@ -2095,7 +2098,7 @@ rlogind_error (int f, int syserr, const char *msg, ...)
     snprintf (bp, sizeof buf - (bp - buf),
              "rlogind: %s: %s.\r\n", buf2, strerror (errno));
   else
-    snprintf (bp, sizeof buf - (bp - buf), "rlogind: %s.\r\n", buf2);
+    snprintf (bp, sizeof buf - (bp - buf), "rlogind: %s\r\n", buf2);
 
   len = strlen (bp);
   write (f, buf, bp + len - buf);
diff --git a/src/rshd.c b/src/rshd.c
index 6941b16..11bcd7d 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -987,9 +987,9 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
       struct sockaddr_storage sock;
       socklen_t socklen;
 
-# ifdef ENCRYPTION
       if (strlen (cmdbuf) >= 3)
        if (!strncmp (cmdbuf, "-x ", 3))
+# ifdef ENCRYPTION
          {
            int i;
 
@@ -1046,6 +1046,12 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t 
fromlen)
                  }
              }
          }
+# else /* !ENCRYPTION */
+         {
+           shishi_ap_done (ap);
+           rshd_error ("Encrypted sessions are not supported.\n");
+           exit (EXIT_FAILURE);
+         }
 # endif /* ENCRYPTION */
 
     remuser = getstr ("remuser");      /* The requesting user!  */

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

Summary of changes:
 ChangeLog     |   10 ++++++++++
 src/rlogind.c |    7 +++++--
 src/rshd.c    |    8 +++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU Inetutils