aboutsummaryrefslogtreecommitdiffstats
path: root/net/SSLtelnet/files/patch-ag
diff options
context:
space:
mode:
authorKris Kennaway <kris@FreeBSD.org>2002-10-19 10:27:25 +0000
committerKris Kennaway <kris@FreeBSD.org>2002-10-19 10:27:25 +0000
commit15a79b97ac258fdb0b7309d00ef5bffcf8ac2f4b (patch)
tree5ba15972212caa0369ff0205d7dd28ddf944be9d /net/SSLtelnet/files/patch-ag
parent95c138df21555c3d5ad504233555afa358a9bf6e (diff)
Re-add SSLtelnet, with patch (patch-an) to fix the security vulnerability
described in FreeBSD-SA-01:49.telnetd Submitted by: kondo hiroshi <kondo@ysyslab.co.jp> PR: ports/42676
Diffstat (limited to 'net/SSLtelnet/files/patch-ag')
-rw-r--r--net/SSLtelnet/files/patch-ag46
1 files changed, 46 insertions, 0 deletions
diff --git a/net/SSLtelnet/files/patch-ag b/net/SSLtelnet/files/patch-ag
new file mode 100644
index 000000000000..8afb82138f54
--- /dev/null
+++ b/net/SSLtelnet/files/patch-ag
@@ -0,0 +1,46 @@
+--- telnetd/telnetd.c.orig Sat Aug 2 14:40:48 1997
++++ telnetd/telnetd.c Sat Oct 17 22:13:52 1998
+@@ -140,7 +140,7 @@
+ highpty = getnpty();
+ #endif /* CRAY */
+
+- while ((ch = getopt(argc, argv, "d:a:e:lhnr:I:D:B:sS:a:X:z:")) != EOF) {
++ while ((ch = getopt(argc, argv, "d:a:e:lhnr:I:D:B:sS:a:X:z:q")) != EOF) {
+ switch(ch) {
+
+ #ifdef USE_SSL
+@@ -203,6 +203,11 @@
+
+ }
+ break;
++
++ case 'q':
++ ssl_quiet_flag = 1;
++ break;
++
+ #endif /* USE_SSL */
+
+ #ifdef AUTHENTICATE
+@@ -584,7 +589,7 @@
+ #ifdef USE_SSL
+ /* might as well output something useful here ... */
+ fprintf(stderr, " [-z ssl] [-z secure] [-z debug] [-z verify=int]\n\t");
+- fprintf(stderr, " [-z cert=file] [-z key=file]\n\t");
++ fprintf(stderr, " [-z cert=file] [-z key=file] [-q]\n\t");
+ #endif /* USE_SSL */
+ fprintf(stderr, " [port]\n");
+ exit(1);
+@@ -656,7 +661,12 @@
+ fflush(stderr);
+ }
+
+- fatal(net,"[SSL required - connection rejected]");
++ if (ssl_quiet_flag) {
++ sleep(1);
++ exit(1);
++ }
++ else
++ fatal(net,"[SSL required - connection rejected]");
+
+ }
+ }