[SCM] GNU Inetutils branch, master, updated. v1.9.4.90-14-gd92d17e

[Simon Josefsson]

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  d92d17e98af1ae393bb9762112519a7bedbe1a8f (commit)
      from  1175f48255a7f046ca587aff41082bfc8752f991 (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=d92d17e98af1ae393bb9762112519a7bedbe1a8f


commit d92d17e98af1ae393bb9762112519a7bedbe1a8f
Author: Simon Josefsson <simon@josefsson.org>
Date:   Thu Jan 28 17:13:17 2021 +0100

    telnet/commands.c (logoutcmd): Renamed from logout.
    
    Conflicts with system utmp.h's logout(3).
    (cmdtab): Use logoutcmd instead of logout.

diff --git a/ChangeLog b/ChangeLog
index adeab3c..6f2207e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2021-01-28  Simon Josefsson  <simon@josefsson.org>
 
+       * telnet/commands.c (logoutcmd): Renamed from logout.  Conflicts
+       with system utmp.h's logout(3).
+       (cmdtab): Use logoutcmd instead of logout.
+
+2021-01-28  Simon Josefsson  <simon@josefsson.org>
+
        * tests/libls.sh (LSDIR): Fix parallel testing.  Found on Guix and
        Debian, solution is to not use CWD as test directory for libls.
        Inspired by trivial patch by Guillem Jover <guillem@hadrons.org>.
diff --git a/telnet/commands.c b/telnet/commands.c
index a3eee8c..36a951e 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -1661,7 +1661,7 @@ quit (void)
 }
 
 int
-logout (void)
+logoutcmd (void)
 {
   send_do (TELOPT_LOGOUT, 1);
   netflush ();
@@ -2863,7 +2863,7 @@ static int help (int argc, char **argv);
 
 static Command cmdtab[] = {
   {"close", closehelp, bye, 1},
-  {"logout", logouthelp, logout, 1},
+  {"logout", logouthelp, logoutcmd, 1},
   {"display", displayhelp, display, 0},
   {"mode", modestring, modecmd, 0},
   {"open", openhelp, tn, 0},

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

Summary of changes:
 ChangeLog         | 6 ++++++
 telnet/commands.c | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils