rpms/telnet
5
0
Fork 0
Code Issues Pull Requests Releases Activity

auto-import telnet-0.17-16 from telnet-0.17-16.src.rpm

Browse Source
This commit is contained in:
cvsdist 2004-09-09 13:10:15 +00:00
parent acb6917806
commit f4325a00c6
2 changed files with 212 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

203
telnet-0.17-sa-01-49.patch Normal file
View File

@ -0,0 +1,203 @@
--- netkit-telnet-0.17/telnetd/ext.h.sa-01-49 Sun Dec 12 15:59:44 1999
+++ netkit-telnet-0.17/telnetd/ext.h Tue Jul 31 14:16:01 2001
@@ -86,7 +86,10 @@
extern int pcc, ncc;
/* printf into netobuf */
-void netoprintf(const char *fmt, ...) __attribute((format (printf, 1, 2)));
+/* void netoprintf(const char *fmt, ...) __attribute((format (printf, 1, 2))); */
+#define netoprintf output_data
+int output_data(const char *, ...) __attribute((format (printf, 1, 2)));
+void output_datalen(const char *, int);
extern int pty, net;
extern char *line;
@@ -182,7 +185,10 @@
void tty_tspeed(int);
void willoption(int);
void wontoption(int);
+
+#if 0
void writenet(unsigned char *, int);
+#endif
#if defined(ENCRYPT)
extern void (*encrypt_output)(unsigned char *, int);
--- netkit-telnet-0.17/telnetd/slc.c.sa-01-49 Sun Dec 12 15:59:44 1999
+++ netkit-telnet-0.17/telnetd/slc.c Tue Jul 31 14:16:01 2001
@@ -183,7 +183,7 @@
else {
snprintf(slcbuf+slcoff, sizeof(slcbuf)-slcoff, "%c%c", IAC, SE);
slcoff += 2;
- writenet(slcbuf, slcoff);
+ output_datalen(slcbuf, slcoff);
netflush(); /* force it out immediately */
}
}
--- netkit-telnet-0.17/telnetd/state.c.sa-01-49 Sun Dec 12 20:41:44 1999
+++ netkit-telnet-0.17/telnetd/state.c Tue Jul 31 14:16:01 2001
@@ -37,6 +37,7 @@
char state_rcsid[] =
"$Id: telnet-0.17-sa-01-49.patch,v 1.1 2004/09/09 13:10:15 cvsdist Exp $";
+#include <stdarg.h>
#include "telnetd.h"
int not42 = 1;
@@ -1365,7 +1366,7 @@
ADD(IAC);
ADD(SE);
- writenet(statusbuf, ncp - statusbuf);
+ output_datalen(statusbuf, ncp - statusbuf);
netflush(); /* Send it on its way */
DIAG(TD_OPTIONS, {printsub('>', statusbuf, ncp - statusbuf); netflush();});
--- netkit-telnet-0.17/telnetd/termstat.c.sa-01-49 Sun Dec 12 15:59:45 1999
+++ netkit-telnet-0.17/telnetd/termstat.c Tue Jul 31 14:16:01 2001
@@ -128,7 +128,6 @@
void
localstat()
{
- void netflush();
int need_will_echo = 0;
/*
--- netkit-telnet-0.17/telnetd/utility.c.sa-01-49 Tue Jul 31 14:16:01 2001
+++ netkit-telnet-0.17/telnetd/utility.c Tue Jul 31 14:46:15 2001
@@ -38,8 +38,9 @@
"$Id: telnet-0.17-sa-01-49.patch,v 1.1 2004/09/09 13:10:15 cvsdist Exp $";
#define PRINTOPTIONS
-
+#define _GNU_SOURCE
#include <stdarg.h>
+#include <stdio.h>
#include <sys/utsname.h>
#ifdef AUTHENTICATE
@@ -52,6 +53,53 @@
* utility functions performing io related tasks
*/
+/*
+ * This function appends data to nfrontp and advances nfrontp.
+ * Returns the number of characters written altogether (the
+ * buffer may have been flushed in the process).
+ */
+
+int
+output_data(const char *format, ...)
+{
+ va_list args;
+ int len;
+ char *buf;
+
+ va_start(args, format);
+ if ((len = vasprintf(&buf, format, args)) == -1)
+ return -1;
+ output_datalen(buf, len);
+ va_end(args);
+ free(buf);
+ return (len);
+}
+
+void
+output_datalen(const char *buf, int len)
+{
+ int remaining, copied;
+
+ remaining = BUFSIZ - (nfrontp - netobuf);
+ while (len > 0) {
+ /* Free up enough space if the room is too low*/
+ if ((len > BUFSIZ ? BUFSIZ : len) > remaining) {
+ netflush();
+ remaining = BUFSIZ - (nfrontp - netobuf);
+ }
+
+ /* Copy out as much as will fit */
+ copied = remaining > len ? len : remaining;
+ memmove(nfrontp, buf, copied);
+ nfrontp += copied;
+ len -= copied;
+ remaining -= copied;
+ buf += copied;
+ }
+ return;
+}
+
+/**
void
netoprintf(const char *fmt, ...)
{
@@ -67,7 +115,7 @@
va_end(ap);
if (len<0 || len==maxsize) {
- /* didn't fit */
+ / * did not fit * /
netflush();
}
else {
@@ -76,6 +124,7 @@
}
nfrontp += len;
}
+*/
/*
* ttloop
@@ -273,10 +322,15 @@
int n;
if ((n = nfrontp - nbackp) > 0) {
+
+#if 0
+ /* XXX This causes output_data() to recurse and die */
DIAG(TD_REPORT,
{ netoprintf("td: netflush %d chars\r\n", n);
n = nfrontp - nbackp; /* update count */
});
+#endif
+
#if defined(ENCRYPT)
if (encrypt_output) {
char *s = nclearto ? nclearto : nbackp;
@@ -310,11 +364,14 @@
}
}
}
- if (n < 0) {
- if (errno == EWOULDBLOCK || errno == EINTR)
- return;
- cleanup(0);
- }
+
+ if (n == -1) {
+ if (errno == EWOULDBLOCK || errno == EINTR)
+ return;
+ cleanup(0);
+ /* NOTREACHED */
+ }
+
nbackp += n;
#if defined(ENCRYPT)
if (nbackp > nclearto)
@@ -332,7 +389,7 @@
return;
} /* end of netflush */
-
+#if 0
/*
* writenet
*
@@ -355,7 +412,7 @@
nfrontp += len;
} /* end of writenet */
-
+#endif
/*
* miscellaneous functions doing a variety of little jobs follow ...

20
telnet.spec
View File

@ -1,7 +1,7 @@
Summary: The client program for the telnet remote login protocol. Summary: The client program for the telnet remote login protocol.
Name: telnet Name: telnet
Version: 0.17 Version: 0.17
Release: 15 Release: 16
Copyright: BSD Copyright: BSD
Group: Applications/Internet Group: Applications/Internet
Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-%{version}.tar.gz Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-%{version}.tar.gz
@ -11,6 +11,7 @@ Patch1: telnet-client-cvs.patch
Patch5: telnetd-0.17.diff Patch5: telnetd-0.17.diff
Patch6: telnet-0.17-env.patch Patch6: telnet-0.17-env.patch
Patch7: telnet-0.17-issue.patch Patch7: telnet-0.17-issue.patch
Patch8: telnet-0.17-sa-01-49.patch
BuildPreReq: ncurses-devel BuildPreReq: ncurses-devel
Buildroot: %{_tmppath}/%{name}-root Buildroot: %{_tmppath}/%{name}-root
@ -18,10 +19,6 @@ Buildroot: %{_tmppath}/%{name}-root
Telnet is a popular protocol for logging into remote systems over the Telnet is a popular protocol for logging into remote systems over the
Internet. The telnet package provides a command line telnet client. Internet. The telnet package provides a command line telnet client.
Install the telnet package if you want to telnet to remote machines.
This version has support for IPv6.
%package server %package server
Requires: xinetd Requires: xinetd
Group: System Environment/Daemons Group: System Environment/Daemons
@ -29,13 +26,10 @@ Summary: The server program for the telnet remote login protocol.
%description server %description server
Telnet is a popular protocol for logging into remote systems over the Telnet is a popular protocol for logging into remote systems over the
Internet. The telnet-server package a telnet daemon, which will Internet. The telnet-server package includes a telnet daemon that
support remote logins into the host machine. The telnet daemon is supports remote logins into the host machine. The telnet daemon is
enabled by default. You may disable the telnet daemon by editing enabled by default. You may disable the telnet daemon by editing
/etc/xinet.d/telnet /etc/xinetd.d/telnet.
Install the telnet-server package if you want to support remote logins
to your own machine.
%prep %prep
%setup -q -n netkit-telnet-%{version} %setup -q -n netkit-telnet-%{version}
@ -46,6 +40,7 @@ mv telnet telnet-NETKIT
%patch5 -p0 -b .fix %patch5 -p0 -b .fix
%patch6 -p1 -b .env %patch6 -p1 -b .env
%patch7 -p1 -b .issue %patch7 -p1 -b .issue
%patch8 -p1 -b .sa-01-49
%build %build
sh configure --with-c-compiler=gcc sh configure --with-c-compiler=gcc
@ -108,6 +103,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_mandir}/man8/telnetd.8* %{_mandir}/man8/telnetd.8*
%changelog %changelog
* Tue Jul 31 2001 Harald Hoyer <harald@redhat.com>
- fixed security issues (#50335)
* Sat Jul 21 2001 Tim Powers <timp@redhat.com> * Sat Jul 21 2001 Tim Powers <timp@redhat.com>
- no applnk file, it's clutrtering the menus - no applnk file, it's clutrtering the menus