delete support for command-line options that are no longer accepted (and haven't...

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13216 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index b03b62efea44654716ed72cf0d90e34e6b521ea7..fdcc7d21ad9a285ce2595ccd4544b9ed46ea9cc3 100644 (file)
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,3 +1,11 @@
+2001-04-27  Ken Raeburn  <raeburn@mit.edu>
+
+       * telnetd.c (valid_opts): Note that 'w' takes a parameter.
+       Reported by Nico Williams, <Nicolas.Williams@ubsw.com>.
+       (main): Delete options 'N', 'u', 'i' that were removed from
+       valid_opts in 1999.
+       (usage): Don't show -u option.
+
 2001-01-25  Tom Yu  <tlyu@mit.edu>
 
        * state.c (envvarok): Disallow LC_* and NLSPATH.

diff --git a/src/appl/telnet/telnetd/telnetd.c b/src/appl/telnet/telnetd/telnetd.c
index 9a3dd3b7b54699b07ac1a1c89489b8bb7d915097..fdf285d4392d10bdf7f42b5a44e2508a3eb1b38c 100644 (file)
--- a/src/appl/telnet/telnetd/telnetd.c
+++ b/src/appl/telnet/telnetd/telnetd.c
@@ -153,7 +153,7 @@ extern void usage P((void));
  */
 char valid_opts[] = {
        'd', ':', 'h', 'k', 'L', ':', 'n', 'S', ':', 'U',
-       'w',
+       'w', ':',
 #ifdef AUTHENTICATION
        'a', ':', 'X', ':',
 #endif
@@ -464,16 +464,6 @@ main(argc, argv)
                                }
                        }
                        break;
-               case 'u':
-                       maxhostlen = atoi(optarg);
-                       break;
-               case 'i':
-                       always_ip = 1;
-                       break;
-               case 'N':
-                       stripdomain = 0;
-                       break;
-
                default:
                        fprintf(stderr, "telnetd: %c: unknown option\n", ch);
                        /* FALLTHROUGH */
@@ -682,7 +672,7 @@ usage()
 #ifdef AUTHENTICATION
        fprintf(stderr, " [-X auth-type]");
 #endif
-       fprintf(stderr, " [-u utmp_hostname_length] [-U]\n");
+       fprintf(stderr, " [-U]\n");
        fprintf(stderr, " [-w [ip|maxhostlen[,[no]striplocal]]]\n");
        fprintf(stderr, " [port]\n");
        exit(1);