[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-203-gcd22e53

[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  cd22e53cf78c9fd317d2b25296ebf0235c3d4644 (commit)
      from  6d31ccf9b3fc129875122bf3fd62834f652d3cd3 (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=cd22e53cf78c9fd317d2b25296ebf0235c3d4644


commit cd22e53cf78c9fd317d2b25296ebf0235c3d4644
Author: Mats Erik Andersson <address@hidden>
Date:   Sat Nov 10 19:16:04 2012 +0100

    Consistent macro usage.

diff --git a/ChangeLog b/ChangeLog
index e07ed93..798fea6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,18 @@
-2012-10-09  Mats Erik Andersson  <address@hidden>
+2012-11-10  Mats Erik Andersson  <address@hidden>
+
+       Consistent use of device prefix.
+
+       * srs/rlogind.c (setup_utmp, cleanup): Use PATH_TTY_PFX,
+       not PATH_DEV.
+       * talkd/announce.c (announce): Likewise.
+       * talkd/process.c (find_user): Likewise.
+       * telnetd/pty.c (setup_utmp, cleanup): Likewise.
+
+       * src/rexecd.c (doit) [DEBUG]: Use PATH_TTY, not _PATH_TTY.
+
+       * doc/inetutils.texi: Refer to `.k5login', not `.klogin'.
+
+2012-11-09  Mats Erik Andersson  <address@hidden>
 
        rcp: Support encrypted libshishi sessions.
 
@@ -16,7 +30,7 @@
        * src/rshd.c (doit) <denied non-encryption>: Include host name
        in syslog message.
 
-2012-10-06  Mats Erik Andersson  <address@hidden>
+2012-11-06  Mats Erik Andersson  <address@hidden>
 
        rshd: Allow enforced encryption with libshishi,
        rejecting other Kerberized sessions.
@@ -38,7 +52,7 @@
        from PATH_DEV.
        * telnetd/pty.c (setup_utmp): Likewise.
 
-2012-10-05  Mats Erik Andersson  <address@hidden>
+2012-11-05  Mats Erik Andersson  <address@hidden>
 
        rlogind: Buffer overflow, causing stalled and
        incomplete login for encrypted connections.
@@ -55,17 +69,17 @@
        (protocol): Declare FIBUF of length BUFLEN, and DBUF
        of length BUFLEN+1.
 
-2012-10-02  Mats Erik Andersson  <address@hidden>
+2012-11-02  Mats Erik Andersson  <address@hidden>
 
        * telnet/commands.c: Include <limits.h>.  Needed
        by Solaris to have LLONG_MAX.
 
-2012-10-02  Mats Erik Andersson  <address@hidden>
+2012-11-02  Mats Erik Andersson  <address@hidden>
 
        * telnet/commands.c (tn): New block with sanity check of
        numerical port, being out of range, or mixed with letters.
 
-2012-10-01  Mats Erik Andersson  <address@hidden>
+2012-11-01  Mats Erik Andersson  <address@hidden>
 
        ftp: Build without readline support.
 
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index 626f297..8ac50ed 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -2047,15 +2047,15 @@ mode is in effect.  See the appropriate man pages for 
more information.
 
 If @command{rlogin} was compiled with kerberos support, options
 @option{-x}, @option{-k}, @option{-K} are available.  Each user may
-have a private authorization list in the file @file{.klogin} in their
+have a private authorization list in the file @file{.k5login} in their
 home directory.  Each line in this file should contain a Kerberos
-principal name of the form @samp{principal.instance@@realm}.  If the
+principal name of the form @samp{principal/instance@@realm}.  If the
 originating user is authenticated to one of the principals named in
address@hidden, access is granted to the account.  The principal
address@hidden@@localrealm} is granted access if there is no
address@hidden file.  Otherwise a login and password will be prompted
address@hidden, access is granted to the account.  The principal
address@hidden@@localrealm} is granted access if there is no
address@hidden file.  Otherwise a login and password will be prompted
 for on the remote machine as in @command{login}.  To avoid certain
-security problems, the @file{.klogin} file must be owned by the remote
+security problems, the @file{.k5login} file must be owned by the remote
 user.  If Kerberos authentication fails, a warning message is printed
 and the standard Berkeley rlogin is used instead.
 
diff --git a/paths b/paths
index 6afb639..8a61652 100644
--- a/paths
+++ b/paths
@@ -20,7 +20,7 @@
 
 # This file describes how to set various paths used by programs in inetutils.
 #
-# The rules that determine what a given PATH_FOO define expands to are:
+# The rules determining what a given PATH_FOO expands to, are these:
 #  (1) If the user specifies --with-path-foo, that value is used.
 #  (2) If _PATH_FOO is defined in <paths.h>, that value is used.
 #  (3) The lines below are consulted.  They are whitespace-separated
@@ -30,22 +30,22 @@
 #                 it to VALUE.  If VALUE begins with a make-variable of the
 #                 form `$(NAME)' and a corresponding shell-variable $NAME
 #                 exists at configure time, the value of $NAME is substituted
-#                 for the $(NAME) for testing (but not subsitution) purposes.
-#      test:T  -- Use `test -T' to test for file existance
+#                 for the $(NAME) for testing (but not substitution) purposes.
+#      test:T  -- Use `test -T' to test for file existance.
 #      x       -- The same as test:x
-#       d       -- The same as test:d
+#      d       -- The same as test:d
 #      c       -- The same as test:c
 #      b       -- The same as test:b
 #      <ach.h>:SYMBOL
-#              -- If SYMBOL is defined in <ack.h>, use SYM
+#              -- If SYMBOL is defined in <ack.h>, use SYMBOL.
 #       <ack.h> -- The same as <ack.h>:_PATH_FOO
 #       search:NAME:PATH
 #              -- Search for NAME in the colon-separated path PATH, and use
 #                 the first thing found; if the `:PATH' is omitted, it
-#                 uses the environment variable $PATH
-#      no      -- Set the default to `no' (even if there's already a default).
-#       FILE   -- The same as "FILE" (the quoted syntax only need be used if
-#                 the contents could match one of the special syntaxes)
+#                 uses the environment variable $PATH.
+#      no      -- Set the default to `no' (even if there already is a default).
+#      FILE    -- The same as "FILE" (the quoted syntax only need be used if
+#                 the contents could match one of the special syntaxes).
 #
 #      If cross-compiling then every file-existance test is made to fail
 #      (regardless of what exists on the compilation system), forcing
@@ -58,13 +58,13 @@
 #      the value `no', but that's probably not a severe problem).
 #
 #  (4) If the resulting value is the string `no', then PATH_FOO is never
-#      defined by any method (programs that use it should check that it's
-#      defined before using it).
+#      defined by any method. (Programs that use it should check that the
+#      symbol is defined before using it).
 #
 # Programs wanting to use a particular path PATH_FOO should:
-#  (1) Add the make variable $(PATHDEF_FOO) to CPPFLAGS while compiling (this
-#      expands either into either -D... for the path variable, or nothing).
-#  (2) Include any appropriate headers to match <header.h> entries below
+#  (1) Add the make variable $(PATHDEF_FOO) to CPPFLAGS while compiling. (This
+#      expands either into either -D... for the path variable, or nothing.)
+#  (2) Include any appropriate headers to match <header.h> entries below.
 #
 
 PATH_BSHELL    x $(bindir)/sh search:sh
diff --git a/src/rexecd.c b/src/rexecd.c
index ce61cc9..32a2228 100644
--- a/src/rexecd.c
+++ b/src/rexecd.c
@@ -266,7 +266,7 @@ doit (int f, struct sockaddr *fromp, socklen_t fromlen)
   signal (SIGTERM, SIG_DFL);
 #ifdef DEBUG
   {
-    int t = open (_PATH_TTY, O_RDWR);
+    int t = open (PATH_TTY, O_RDWR);
     if (t >= 0)
       {
        ioctl (t, TIOCNOTTY, (char *) 0);
diff --git a/src/rlogind.c b/src/rlogind.c
index db77df2..2a5428e 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -1027,7 +1027,7 @@ setup_utmp (char *line, char *host)
 {
   char *ut_id = utmp_ptsid (line, "rl");
 
-  utmp_init (line + sizeof (PATH_DEV) - 1, ".rlogin", ut_id, host);
+  utmp_init (line + sizeof (PATH_TTY_PFX) - 1, ".rlogin", ut_id, host);
 }
 
 void
@@ -1915,7 +1915,7 @@ cleanup (int signo _GL_UNUSED_PARAMETER)
 {
   char *p;
 
-  p = line + sizeof (PATH_DEV) - 1;
+  p = line + sizeof (PATH_TTY_PFX) - 1;
 #if !defined HAVE_LOGOUT || !defined HAVE_LOGWTMP
   utmp_logout (p);
   chmod (line, 0644);
diff --git a/talkd/announce.c b/talkd/announce.c
index 7bf1818..3362969 100644
--- a/talkd/announce.c
+++ b/talkd/announce.c
@@ -132,14 +132,14 @@ announce (CTL_MSG * request, char *remote_machine)
   struct stat st;
   int rc;
 
-  len = sizeof (PATH_DEV) + strlen (request->r_tty) + 2;
+  len = sizeof (PATH_TTY_PFX) + strlen (request->r_tty) + 2;
   ttypath = malloc (len);
   if (!ttypath)
     {
       syslog (LOG_ERR, "Out of memory");
       exit (EXIT_FAILURE);
     }
-  sprintf (ttypath, "%s/%s", PATH_DEV, request->r_tty);
+  sprintf (ttypath, "%s/%s", PATH_TTY_PFX, request->r_tty);
   rc = stat (ttypath, &st);
   free (ttypath);
   if (rc < 0 || (st.st_mode & S_IWGRP) == 0)
diff --git a/talkd/process.c b/talkd/process.c
index 7107135..8b02779 100644
--- a/talkd/process.c
+++ b/talkd/process.c
@@ -177,14 +177,14 @@ find_user (char *name, char *tty)
   size_t utmp_count;
   int status;
   struct stat statb;
-  char ftty[sizeof (PATH_DEV) + sizeof (uptr->ut_line)];
+  char ftty[sizeof (PATH_TTY_PFX) + sizeof (uptr->ut_line)];
   time_t last_time = 0;
   int notty;
 
   notty = (*tty == '\0');
 
   status = NOT_HERE;
-  strcpy (ftty, PATH_DEV);
+  strcpy (ftty, PATH_TTY_PFX);
 
   read_utmp (UTMP_FILE, &utmp_count, &utmpbuf,
             READ_UTMP_USER_PROCESS | READ_UTMP_CHECK_PIDS);
@@ -196,8 +196,9 @@ find_user (char *name, char *tty)
          if (notty)
            {
              /* no particular tty was requested */
-             strncpy (ftty + sizeof (PATH_DEV) - 1,
-                      uptr->ut_line, sizeof (ftty) - sizeof (PATH_DEV) - 1);
+             strncpy (ftty + sizeof (PATH_TTY_PFX) - 1,
+                      uptr->ut_line,
+                      sizeof (ftty) - sizeof (PATH_TTY_PFX) - 1);
              ftty[sizeof (ftty) - 1] = 0;
 
              if (stat (ftty, &statb) == 0)
diff --git a/telnetd/pty.c b/telnetd/pty.c
index 0926142..53a3049 100644
--- a/telnetd/pty.c
+++ b/telnetd/pty.c
@@ -32,7 +32,7 @@ void
 setup_utmp (char *line, char *host)
 {
   char *ut_id = utmp_ptsid (line, "tn");
-  utmp_init (line + sizeof (PATH_DEV) - 1, ".telnet", ut_id, host);
+  utmp_init (line + sizeof (PATH_TTY_PFX) - 1, ".telnet", ut_id, host);
 }
 
 
@@ -149,7 +149,7 @@ cleanup (int sig)
              (long) pid, WEXITSTATUS (status));
     }
 
-  p = line + sizeof (PATH_DEV) - 1;
+  p = line + sizeof (PATH_TTY_PFX) - 1;
   utmp_logout (p);
   chmod (line, 0644);
   chown (line, 0, 0);

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

Summary of changes:
 ChangeLog          |   26 ++++++++++++++++++++------
 doc/inetutils.texi |   12 ++++++------
 paths              |   28 ++++++++++++++--------------
 src/rexecd.c       |    2 +-
 src/rlogind.c      |    4 ++--
 talkd/announce.c   |    4 ++--
 talkd/process.c    |    9 +++++----
 telnetd/pty.c      |    4 ++--
 8 files changed, 52 insertions(+), 37 deletions(-)


hooks/post-receive
-- 
GNU Inetutils