From MAILER-DAEMON Thu Mar 02 10:39:20 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1cjSp6-0003jd-OE
	for mharc-commit-inetutils@gnu.org; Thu, 02 Mar 2017 10:39:20 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:35871)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1cjSp1-0003j9-Vr
	for commit-inetutils@gnu.org; Thu, 02 Mar 2017 10:39:19 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1cjSoy-0006G9-NV
	for commit-inetutils@gnu.org; Thu, 02 Mar 2017 10:39:16 -0500
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:54093)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1cjSoy-0006Fx-KU
	for commit-inetutils@gnu.org; Thu, 02 Mar 2017 10:39:12 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 117592)
	id 7564F25FC0; Thu,  2 Mar 2017 10:39:12 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_4-32-g56fc0cc
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c41f6dfcd469d1e41c3fcf924607016d9d983a0b
X-Git-Newrev: 56fc0cc15dd9b2986e890dd8b919c9af4a8fa46a
Message-Id: <20170302153912.7564F25FC0@vcs0.savannah.gnu.org>
Date: Thu,  2 Mar 2017 10:39:11 -0500 (EST)
From: gnu@gisladisker.se (Mats Erik Andersson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils/>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Mar 2017 15:39:19 -0000

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  56fc0cc15dd9b2986e890dd8b919c9af4a8fa46a (commit)
       via  73e2811a0512556fd5359acc4387f46c79a9884a (commit)
      from  c41f6dfcd469d1e41c3fcf924607016d9d983a0b (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=56fc0cc15dd9b2986e890dd8b919c9af4a8fa46a


commit 56fc0cc15dd9b2986e890dd8b919c9af4a8fa46a
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu Mar 2 16:20:47 2017 +0100

    ftp: Portability to Android.
    
    Add external declaration of getpass().
    Tiny patch by Fredrik Fornwall <fredrik@fornwall.net>.

diff --git a/ChangeLog b/ChangeLog
index 6b2a36b..119787b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2017-03-02  Fredrik Fornwall  <fredrik@fornwall.net>  (tiny change)
+
+	ftp: Portability to Android.
+	Without a check for HAVE_DECL_GETPASS and without making a
+	local function declaration, the implicit declaration causes
+	crashes on 64-bit systems lacking declared getpass(), such
+	as Android.  Reported in:
+	http://lists.gnu.org/archive/html/bug-inetutils/2016-10/msg00000.html
+
+	* ftp/cmds.c [!HAVE_DECL_GETPASS] (user, account): Declare getpass()
+	as external function.
+	* ftp/ftp.c (login): Likewise.
+
 2017-03-02  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	whois: Update Canadian TLD server.
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 233658b..c90180e 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -1721,6 +1721,9 @@ shell (int argc, char **argv _GL_UNUSED_PARAMETER)
 void
 user (int argc, char **argv)
 {
+#if !HAVE_DECL_GETPASS
+  extern char *getpass ();
+#endif
   char acct[80];
   int n, aflag = 0;
 
@@ -2070,6 +2073,9 @@ globulize (char *cp)
 void
 account (int argc, char **argv)
 {
+#if !HAVE_DECL_GETPASS
+  extern char *getpass ();
+#endif
   char acct[50], *ap;
 
   if (argc > 1)
diff --git a/ftp/ftp.c b/ftp/ftp.c
index a9d96bf..5eff2d7 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -296,6 +296,9 @@ bad:
 int
 login (char *host)
 {
+#if !HAVE_DECL_GETPASS
+  extern char *getpass ();
+#endif
   char tmp[80];
   char *user, *pass, *acct, *p;
   int n, aflag = 0;

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=73e2811a0512556fd5359acc4387f46c79a9884a


commit 73e2811a0512556fd5359acc4387f46c79a9884a
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu Mar 2 15:38:38 2017 +0100

    whois: Update Canadian TLD server.

diff --git a/ChangeLog b/ChangeLog
index c632d86..6b2a36b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2017-03-02  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	whois: Update Canadian TLD server.
+	Old host name no longer exists.  Reported by Neil Mayhem:
+	http://lists.gnu.org/archive/html/bug-inetutils/2017-01/msg00000.html
+
+	* whois/tld_serv_list (.ca): New host 'whois.cira.ca'.
+
 2017-02-27  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	telnetd: Portability of TTY termcap to Solaris systems.
diff --git a/whois/tld_serv_list b/whois/tld_serv_list
index 056efcf..91697b8 100644
--- a/whois/tld_serv_list
+++ b/whois/tld_serv_list
@@ -81,7 +81,7 @@
 #.bw			# NIC? www.botsnet.bw
 #.by	NONE		# NIC? http://unibel.by www.open.by
 .bz	NONE		# http://www.psg.com/dns/bz/
-.ca	whois.cdnnet.ca
+.ca	whois.cira.ca
 .cc	whois.nic.cc
 .cd	WEB http://www.nic.cd/database/cd/
 #.cf	NONE		# NIC? http://www.socatel.intnet.cf

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

Summary of changes:
 ChangeLog           | 21 +++++++++++++++++++++
 ftp/cmds.c          |  6 ++++++
 ftp/ftp.c           |  3 +++
 whois/tld_serv_list |  2 +-
 4 files changed, 31 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Mar 03 13:53:23 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1cjsKR-0000cF-MO
	for mharc-commit-inetutils@gnu.org; Fri, 03 Mar 2017 13:53:23 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43214)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1cjsKP-0000ax-DL
	for commit-inetutils@gnu.org; Fri, 03 Mar 2017 13:53:22 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1cjsKO-0006ib-0h
	for commit-inetutils@gnu.org; Fri, 03 Mar 2017 13:53:21 -0500
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:42983)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1cjsKN-0006iX-T1
	for commit-inetutils@gnu.org; Fri, 03 Mar 2017 13:53:19 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 117592)
	id 8913225F97; Fri,  3 Mar 2017 13:53:19 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_4-33-ge0b19a9
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 56fc0cc15dd9b2986e890dd8b919c9af4a8fa46a
X-Git-Newrev: e0b19a99126c32b3566cedbedc517c2707c26c55
Message-Id: <20170303185319.8913225F97@vcs0.savannah.gnu.org>
Date: Fri,  3 Mar 2017 13:53:19 -0500 (EST)
From: gnu@gisladisker.se (Mats Erik Andersson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils/>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Mar 2017 18:53:22 -0000

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  e0b19a99126c32b3566cedbedc517c2707c26c55 (commit)
      from  56fc0cc15dd9b2986e890dd8b919c9af4a8fa46a (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=e0b19a99126c32b3566cedbedc517c2707c26c55


commit e0b19a99126c32b3566cedbedc517c2707c26c55
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Mar 3 19:49:55 2017 +0100

    Test utility displays some termcaps.

diff --git a/ChangeLog b/ChangeLog
index 119787b..14b51b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2017-03-03  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Test utility displays some termcaps.
+
+	* tests/Makefile.am (identify_LDADD): Set to contain
+	`$(top_builddir)/lib/libgnu.a' and `$(LIBUTIL)'.
+	* tests/identify.c: Include <string.h>.
+	[HAVE_TERMIOS_H]: Include <errno.h>, <termios.h>, <pty.h>.
+	[HAVE_TERMIOS_H && HAVE_FCNTL_H]: Include <fcntl.h>.
+	[HAVE_TCGETATTR] (test_flag): New macro.
+	[HAVE_TCGETATTR] (do_termcap): New function.
+	[HAVE_TCGETATTR] (main): Call do_termcap().
+
 2017-03-02  Fredrik Fornwall  <fredrik@fornwall.net>  (tiny change)
 
 	ftp: Portability to Android.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 379e0ed..ce98fc3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,7 +22,7 @@ AM_CPPFLAGS = $(iu_INCLUDES)
 LDADD = $(iu_LIBRARIES)
 
 noinst_PROGRAMS = identify
-identify_LDADD =
+identify_LDADD = $(top_builddir)/lib/libgnu.a $(LIBUTIL)
 
 check_PROGRAMS = localhost readutmp waitdaemon
 
diff --git a/tests/identify.c b/tests/identify.c
index b96051a..c0faf40 100644
--- a/tests/identify.c
+++ b/tests/identify.c
@@ -29,6 +29,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #include <sys/param.h>
@@ -37,9 +38,128 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
+#ifdef HAVE_TERMIOS_H
+# include <errno.h>
+# if HAVE_FCNTL_H
+#  include <fcntl.h>
+# endif
+# include <termios.h>
+
+# include <pty.h>
+#endif /* HAVE_TERMIOS_H */
+
 #define tell_macro(a,b)	\
   printf ("%s: %s\n", (b) ? "Available macro" : "Not defined", (a));
 
+#ifdef HAVE_TCGETATTR
+# define test_flag(a, b, name)	\
+  if (tc.a & b) printf (" %s", name);
+
+void
+do_termcap(void)
+{
+  int pty, tty;
+  struct termios tc;
+
+  pty = openpty (&pty, &tty, NULL, NULL, NULL);
+  if (pty < 0)
+    {
+      fprintf (stderr, "openpt: errno = %d, %s\n",
+	       errno, strerror (errno));
+      return;
+    }
+
+  if (tcgetattr (tty, &tc) < 0)
+    {
+      fprintf (stderr, "tcgetattr; errno = %d, %s\n",
+	       errno, strerror (errno));
+      return;
+    }
+
+  printf ("_POSIX_VDISABLE = 0x%02x\n\n", _POSIX_VDISABLE);
+
+  /* Report the most interesting observations.  */
+  puts ("Default terminal settings (octal and hexadecimal):");
+  printf ("iflag = 0%06o = 0x%04x,  oflag = 0%06o = 0x%04x\n",
+	  tc.c_iflag, tc.c_iflag, tc.c_oflag, tc.c_oflag);
+  printf ("cflag = 0%06o = 0x%04x,  lflag = 0%06o = 0x%04x\n",
+	  tc.c_cflag, tc.c_cflag, tc.c_lflag, tc.c_lflag);
+
+  puts ("\nThe most relevant properties being set:");
+
+  printf ("iflag:");
+  test_flag (c_iflag, IXOFF, "IXOFF");
+  test_flag (c_iflag, IXON, "IXON");
+  test_flag (c_iflag, IXANY, "IXANY");
+  test_flag (c_iflag, BRKINT, "BRKINT");
+  test_flag (c_iflag, ISTRIP, "ISTRIP");
+  test_flag (c_iflag, IGNCR, "IGNCR");
+  test_flag (c_iflag, INLCR, "INLCR");
+  test_flag (c_iflag, ICRNL, "ICRNL");
+  puts ("");
+
+  printf ("oflag:");
+  test_flag (c_oflag, OPOST, "OPOST");
+  test_flag (c_oflag, OCRNL, "OCRNL");
+  test_flag (c_oflag, ONLCR, "ONLCR");
+  test_flag (c_oflag, ONLRET, "ONLRET");
+
+# ifdef TABDLY
+  printf (" TAB");
+  switch (tc.c_oflag & TABDLY)
+    {
+    case TAB3:
+      putchar ('3');
+      break;
+#  ifdef TAB2
+    case TAB2:
+      putchar ('2');
+      break;
+#  endif /* TAB2 */
+#  ifdef TAB1
+    case TAB1:
+      putchar ('1');
+      break;
+#  endif /* TAB1 */
+    case TAB0:
+      putchar ('0');
+      break;
+    }
+# elif defined OXTABS /* !TABDLY */
+  test_flag (c_oflag, OXTABS, "OXTABS");
+# endif /* OXTABS */
+
+  puts ("");
+
+  printf ("cflag:");
+  switch (tc.c_cflag & CSIZE)
+    {
+    case CS8:
+      printf (" CS8");
+      break;
+    case CS7:
+      printf (" CS7");
+    }
+  puts ("");
+
+  printf ("lflag:");
+  test_flag (c_lflag, ICANON, "ICANON");
+  test_flag (c_lflag, ISIG, "TRAPSIG");
+  test_flag (c_lflag, IEXTEN, "IEXTEN");
+  test_flag (c_lflag, ECHO, "ECHO");
+  test_flag (c_lflag, ECHOE, "ECHOE");
+  test_flag (c_lflag, ECHOK, "ECHOK");
+  test_flag (c_lflag, ECHOKE, "ECHOKE");
+  test_flag (c_lflag, ECHONL, "ECHONL");
+  test_flag (c_lflag, ECHOCTL, "ECHOCTL");
+  puts ("");
+
+  return;
+}
+# undef test_flag
+#endif /* HAVE_TCGETATTR */
+
+
 int
 main (void)
 {
@@ -113,5 +233,11 @@ main (void)
 
   printf ("Size of 'struct sockaddr_un.sun_path': %zu\n",
 	  sizeof (su.sun_path));
+
+#if HAVE_TCGETATTR
+  puts("");
+  do_termcap ();
+#endif
+
   return 0;
 }

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

Summary of changes:
 ChangeLog         |  13 ++++++
 tests/Makefile.am |   2 +-
 tests/identify.c  | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 140 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Mar 04 13:59:14 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ckEte-00088Y-Ee
	for mharc-commit-inetutils@gnu.org; Sat, 04 Mar 2017 13:59:14 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:58531)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1ckEtb-00086Q-Qo
	for commit-inetutils@gnu.org; Sat, 04 Mar 2017 13:59:13 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1ckEta-0000Oc-7c
	for commit-inetutils@gnu.org; Sat, 04 Mar 2017 13:59:11 -0500
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:54806)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1ckEta-0000OX-3v
	for commit-inetutils@gnu.org; Sat, 04 Mar 2017 13:59:10 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 117592)
	id BE095270F6; Sat,  4 Mar 2017 13:59:09 -0500 (EST)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_4-34-g5f02a4d
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e0b19a99126c32b3566cedbedc517c2707c26c55
X-Git-Newrev: 5f02a4d818cc627cf11e2a3817774a1a7cae59dc
Message-Id: <20170304185909.BE095270F6@vcs0.savannah.gnu.org>
Date: Sat,  4 Mar 2017 13:59:09 -0500 (EST)
From: gnu@gisladisker.se (Mats Erik Andersson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils/>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Mar 2017 18:59:13 -0000

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  5f02a4d818cc627cf11e2a3817774a1a7cae59dc (commit)
      from  e0b19a99126c32b3566cedbedc517c2707c26c55 (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=5f02a4d818cc627cf11e2a3817774a1a7cae59dc


commit 5f02a4d818cc627cf11e2a3817774a1a7cae59dc
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Mar 4 19:55:28 2017 +0100

    telnetd: Use tty, not pty on Solaris.
    
    Three cases more where terminal capabilities must
    be set via the slave descriptor, not the master.

diff --git a/ChangeLog b/ChangeLog
index 14b51b5..967de10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2017-03-04  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	telnetd: Use tty, not pty on Solaris.
+	Setting of terminal attributes as well setting of window size
+	must be done via the slave descriptor, not the master descriptor.
+
+	* telnetd/term.c [SOLARIS || SOLARIS10] (set_termbuf):
+	New variables NAME, TTY.  A call to ptsname() reveals whether
+	`pty' is a master.  Then open that file, update TTY, and call
+	_term_setattr().
+	[SOLARIS || SOLARIS10] (init_termbuf): Simplify to use a single
+	call to _term_getattr(), similar to set_termbuf().
+	* telnetd/termstat.c: Include <fcntl.h>.
+	[TIOCSWINSZ && (SOLARIS || SOLARIS10)] (clientstat) <TELOPT_NAWS>:
+	New variables NAME, TTY.  Similar mechanism as above, but call
+	ioctl with window size.
+	[TIOCSWINSZ && (SOLARIS || SOLARIS10)] (defer_terminit): Likewise.
+
 2017-03-03  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	Test utility displays some termcaps.
diff --git a/telnetd/term.c b/telnetd/term.c
index a190e28..7ddbe46 100644
--- a/telnetd/term.c
+++ b/telnetd/term.c
@@ -503,7 +503,9 @@ tty_iscrnl (void)
 void
 init_termbuf (void)
 {
-#if defined SOLARIS10 || defined SOLARIS
+#if !defined SOLARIS10 && !defined SOLARIS
+  _term_getattr (pty, &termbuf);
+#else /* SOLARIS || SOLARIS10 */
   /* On Solaris the master PTY is not able to report terminal
    * settings about the slave TTY, since it is only the slave
    * that is working with an designated line discipline.
@@ -512,21 +514,18 @@ init_termbuf (void)
    * This happens for the parent process.  The child process
    * sees an empty name, so undergoes minimal processing.
    */
-  char *name = ptsname(pty);
+  int tty = pty;
+  char *name = ptsname (pty);
 
-  if (!name)
-    _term_getattr (pty, &termbuf);
-  else
-    {
-      /* Minimal access means read only!  */
-      int tty = open(name, O_RDONLY | O_NONBLOCK);
+  if (name)
+    /* Minimal access means read only!  */
+    tty = open (name, O_RDONLY | O_NONBLOCK);
 
-      _term_getattr (tty, &termbuf);
-      close(tty);
-    }
-#else /* !SOLARIS && !SOLARIS10 */
-  _term_getattr (pty, &termbuf);
-#endif
+  _term_getattr (tty, &termbuf);
+
+  if (name)
+    close (tty);
+#endif /* SOLARIS || SOLARIS10 */
 
   termbuf2 = termbuf;
 }
@@ -555,7 +554,23 @@ void
 set_termbuf (void)
 {
   if (memcmp (&termbuf, &termbuf2, sizeof (termbuf)))
+#if !defined SOLARIS10 && !defined SOLARIS
     _term_setattr (pty, &termbuf);
+#else /* SOLARIS || SOLARIS10 */
+    {
+      /* Same reason as with _term_getattr.  */
+      int tty = pty;
+      char *name = ptsname (pty);
+
+      if (name)
+	tty = open (name, O_RDWR | O_NONBLOCK | O_NOCTTY);
+
+      _term_setattr (tty, &termbuf);
+
+      if (name)
+	close (tty);
+    }
+#endif /* SOLARIS || SOLARIS10 */
 }
 
 /* spcset(func, valp, valpp)
diff --git a/telnetd/termstat.c b/telnetd/termstat.c
index 5f9e2ef..a3e37d0 100644
--- a/telnetd/termstat.c
+++ b/telnetd/termstat.c
@@ -51,6 +51,8 @@
 
 #include "telnetd.h"
 
+#include <fcntl.h>	/* Solaris */
+
 /*
  * local variables
  */
@@ -591,7 +593,23 @@ clientstat (register int code, register int parm1, register int parm2)
 
 	ws.ws_col = parm1;
 	ws.ws_row = parm2;
+
+# if !defined SOLARIS && !defined SOLARIS10
 	ioctl (pty, TIOCSWINSZ, (char *) &ws);
+# else /* SOLARIS || SOLARIS10 */
+	{
+	  int tty = pty;
+	  char *name = ptsname (pty);
+
+	  if (name)
+	    tty = open (name, O_RDWR | O_NONBLOCK | O_NOCTTY);
+
+	  ioctl (tty, TIOCSWINSZ, (char *) &ws);
+
+	  if (name)
+	    close (tty);
+	}
+# endif /* SOLARIS || SOLARIS10 */
       }
 #endif /* TIOCSWINSZ */
 
@@ -682,9 +700,25 @@ defer_terminit (void)
       memset ((char *) &ws, 0, sizeof (ws));
       ws.ws_col = def_col;
       ws.ws_row = def_row;
+
+# if !defined SOLARIS && !defined SOLARIS10
       ioctl (pty, TIOCSWINSZ, (char *) &ws);
+# else /* SOLARIS || SOLARIS10 */
+      {
+	int tty = pty;
+	char *name = ptsname (pty);
+
+	if (name)
+	  tty = open (name, O_RDWR | O_NONBLOCK | O_NOCTTY);
+
+	ioctl (tty, TIOCSWINSZ, (char *) &ws);
+
+	if (name)
+	  close (tty);
+      }
+# endif /* SOLARIS || SOLARIS10 */
     }
-#endif
+#endif /* TIOCSWINSZ */
 
   /*
    * The only other module that currently defers anything.

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

Summary of changes:
 ChangeLog          | 18 ++++++++++++++++++
 telnetd/term.c     | 43 +++++++++++++++++++++++++++++--------------
 telnetd/termstat.c | 36 +++++++++++++++++++++++++++++++++++-
 3 files changed, 82 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


