enable fixes

SCCS-vsn: libexec/tftpd/tftpd.c 4.13

diff --git a/usr/src/libexec/tftpd/tftpd.c b/usr/src/libexec/tftpd/tftpd.c
index 3de71d5..2c4db82 100644 (file)
--- a/usr/src/libexec/tftpd/tftpd.c
+++ b/usr/src/libexec/tftpd/tftpd.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)tftpd.c    4.12 (Berkeley) %G%";
+static char sccsid[] = "@(#)tftpd.c    4.13 (Berkeley) %G%";

 #endif
 
 /*
 #endif
 
 /*


@@ -48,9 +48,6 @@ main()
        }
        from.sin_family = AF_INET;
        alarm(0);
        }
        from.sin_family = AF_INET;
        alarm(0);

-#ifdef do_it_right_and_use_a_new_port
-       if (fork())
-               exit(0);

        close(0);
        close(1);
        peer = socket(AF_INET, SOCK_DGRAM, 0);
        close(0);
        close(1);
        peer = socket(AF_INET, SOCK_DGRAM, 0);


@@ -62,13 +59,6 @@ main()
                perror("tftpd: bind");
                exit(1);
        }
                perror("tftpd: bind");
                exit(1);
        }

-#else
-       /*
-        * The current 4.2 tftp client neglects to switch its destination
-        * port after the first ACK.
-        */
-       peer = 0;
-#endif

        if (connect(peer, (caddr_t)&from, sizeof(from)) < 0) {
                perror("tftpd: connect");
                exit(1);
        if (connect(peer, (caddr_t)&from, sizeof(from)) < 0) {
                perror("tftpd: connect");
                exit(1);