svn commit: lorikeet r617 - in trunk/heimdal/appl/telnet/telnetd: .

[lha at samba.org]

Author: lha
Date: 2006-10-21 00:11:48 +0000 (Sat, 21 Oct 2006)
New Revision: 617

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=617

Log:
move streamspty headers to avoid socket_wrapper problems on solaris 8, from heimdal current
Modified:
   trunk/heimdal/appl/telnet/telnetd/sys_term.c
   trunk/heimdal/appl/telnet/telnetd/telnetd.c
   trunk/heimdal/appl/telnet/telnetd/telnetd.h


Changeset:
Modified: trunk/heimdal/appl/telnet/telnetd/sys_term.c
===================================================================
--- trunk/heimdal/appl/telnet/telnetd/sys_term.c	2006-10-20 21:47:46 UTC (rev 616)
+++ trunk/heimdal/appl/telnet/telnetd/sys_term.c	2006-10-21 00:11:48 UTC (rev 617)
@@ -33,7 +33,7 @@
 
 #include "telnetd.h"
 
-RCSID("$Id: sys_term.c,v 1.114 2005/11/03 16:40:05 joda Exp $");
+RCSID("$Id: sys_term.c,v 1.115 2006/10/21 00:09:25 lha Exp $");
 
 #if defined(_CRAY) || (defined(__hpux) && !defined(HAVE_UTMPX_H))
 # define PARENT_DOES_UTMP
@@ -90,29 +90,6 @@
 #include <tmpdir.h>
 #endif	/* CRAY */
 
-#ifdef	STREAMSPTY
-
-#ifdef HAVE_SAC_H
-#include <sac.h>
-#endif
-
-#ifdef HAVE_SYS_STROPTS_H
-#include <sys/stropts.h>
-#endif
-
-#endif /* STREAMSPTY */
-
-#undef NOERROR
-
-#ifdef	HAVE_SYS_STREAM_H
-#ifdef  HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif
-#ifdef __hpux
-#undef SE
-#endif
-#include <sys/stream.h>
-#endif
 #if !(defined(__sgi) || defined(__linux) || defined(_AIX)) && defined(HAVE_SYS_TTY)
 #include <sys/tty.h>
 #endif

Modified: trunk/heimdal/appl/telnet/telnetd/telnetd.c
===================================================================
--- trunk/heimdal/appl/telnet/telnetd/telnetd.c	2006-10-20 21:47:46 UTC (rev 616)
+++ trunk/heimdal/appl/telnet/telnetd/telnetd.c	2006-10-21 00:11:48 UTC (rev 617)
@@ -33,7 +33,7 @@
 
 #include "telnetd.h"
 
-RCSID("$Id: telnetd.c,v 1.79 2006/09/19 08:26:21 lha Exp $");
+RCSID("$Id: telnetd.c,v 1.80 2006/10/21 00:09:10 lha Exp $");
 
 #ifdef _SC_CRAY_SECURE_SYS
 #include <sys/sysv.h>
@@ -63,18 +63,8 @@
 int	require_encryption = 0;
 #endif
 
-#undef NOERROR
+#ifdef STREAMPTY
 
-#ifdef	STREAMSPTY
-# include <stropts.h>
-# include <termios.h>
-#ifdef HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif /* HAVE_SYS_UIO_H */
-#ifdef HAVE_SYS_STREAM_H
-#include <sys/stream.h>
-#endif
-
 #ifdef _AIX
 #include <sys/termio.h>
 #endif

Modified: trunk/heimdal/appl/telnet/telnetd/telnetd.h
===================================================================
--- trunk/heimdal/appl/telnet/telnetd/telnetd.h	2006-10-20 21:47:46 UTC (rev 616)
+++ trunk/heimdal/appl/telnet/telnetd/telnetd.h	2006-10-21 00:11:48 UTC (rev 617)
@@ -122,6 +122,27 @@
 #include <pty.h>
 #endif
 
+#ifdef	STREAMSPTY
+#ifdef HAVE_SAC_H
+#include <sac.h>
+#endif
+#ifdef HAVE_SYS_STROPTS_H
+#include <sys/stropts.h>
+#endif
+
+# include <stropts.h>
+
+#ifdef  HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+#ifdef	HAVE_SYS_STREAM_H
+#include <sys/stream.h>
+#endif
+
+#endif /* STREAMSPTY */
+
+#undef NOERROR
+
 #include "defs.h"
 
 #ifndef _POSIX_VDISABLE