cnvt setsockopt to new interface

SCCS-vsn: usr.bin/rsh/rsh.c 4.9
SCCS-vsn: usr.bin/rlogin/rlogin.c 4.16
SCCS-vsn: usr.bin/ftp/ftp.c 4.14

diff --git a/usr/src/usr.bin/ftp/ftp.c b/usr/src/usr.bin/ftp/ftp.c
index 20a5fa3..9cc0e16 100644 (file)
--- a/usr/src/usr.bin/ftp/ftp.c
+++ b/usr/src/usr.bin/ftp/ftp.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

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

 #endif
 
 #include <sys/param.h>
 #endif
 
 #include <sys/param.h>


@@ -480,6 +480,7 @@ initconn()
 {
        register char *p, *a;
        int result, len;
 {
        register char *p, *a;
        int result, len;

+       int on = 1;

 
 noport:
        data_addr = myctladdr;
 
 noport:
        data_addr = myctladdr;


@@ -493,7 +494,7 @@ noport:
                return (1);
        }
        if (!sendport)
                return (1);
        }
        if (!sendport)

-               if (setsockopt(data, SOL_SOCKET, SO_REUSEADDR, 0, 0) < 0) {
+               if (setsockopt(data, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) < 0) {

                        perror("ftp: setsockopt (resuse address)");
                        goto bad;
                }
                        perror("ftp: setsockopt (resuse address)");
                        goto bad;
                }


@@ -502,7 +503,7 @@ noport:
                goto bad;
        }
        if (options & SO_DEBUG &&
                goto bad;
        }
        if (options & SO_DEBUG &&

-           setsockopt(data, SOL_SOCKET, SO_DEBUG, 0, 0) < 0)
+           setsockopt(data, SOL_SOCKET, SO_DEBUG, &on, sizeof (on)) < 0)

                perror("ftp: setsockopt (ignored)");
        len = sizeof (data_addr);
        if (getsockname(data, (char *)&data_addr, &len) < 0) {
                perror("ftp: setsockopt (ignored)");
        len = sizeof (data_addr);
        if (getsockname(data, (char *)&data_addr, &len) < 0) {

diff --git a/usr/src/usr.bin/rlogin/rlogin.c b/usr/src/usr.bin/rlogin/rlogin.c
index f81a2cb..fb1f517 100644 (file)
--- a/usr/src/usr.bin/rlogin/rlogin.c
+++ b/usr/src/usr.bin/rlogin/rlogin.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)rlogin.c   4.15 (Berkeley) 83/07/02";
+static char sccsid[] = "@(#)rlogin.c   4.16 (Berkeley) 84/12/03";

 #endif
 
 /*
 #endif
 
 /*


@@ -40,6 +40,7 @@ main(argc, argv)
        struct passwd *pwd;
        struct servent *sp;
        int uid, options = 0;
        struct passwd *pwd;
        struct servent *sp;
        int uid, options = 0;

+       int on = 1;

 
        host = rindex(argv[0], '/');
        if (host)
 
        host = rindex(argv[0], '/');
        if (host)


@@ -99,7 +100,7 @@ another:
         if (rem < 0)
                 exit(1);
        if (options & SO_DEBUG &&
         if (rem < 0)
                 exit(1);
        if (options & SO_DEBUG &&

-           setsockopt(rem, SOL_SOCKET, SO_DEBUG, 0, 0) < 0)
+           setsockopt(rem, SOL_SOCKET, SO_DEBUG, &on, sizeof (on)) < 0)

                perror("rlogin: setsockopt (SO_DEBUG)");
        uid = getuid();
        if (setuid(uid) < 0) {
                perror("rlogin: setsockopt (SO_DEBUG)");
        uid = getuid();
        if (setuid(uid) < 0) {

diff --git a/usr/src/usr.bin/rsh/rsh.c b/usr/src/usr.bin/rsh/rsh.c
index fa22c72..5df2537 100644 (file)
--- a/usr/src/usr.bin/rsh/rsh.c
+++ b/usr/src/usr.bin/rsh/rsh.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)rsh.c      4.8 83/06/10";
+static char sccsid[] = "@(#)rsh.c      4.9 84/12/03";

 #endif
 
 #include <sys/types.h>
 #endif
 
 #include <sys/types.h>


@@ -120,9 +120,9 @@ another:
                exit(2);
        }
        if (options & SO_DEBUG) {
                exit(2);
        }
        if (options & SO_DEBUG) {

-               if (setsockopt(rem, SOL_SOCKET, SO_DEBUG, 0, 0) < 0)
+               if (setsockopt(rem, SOL_SOCKET, SO_DEBUG, &one, sizeof (one)) < 0)

                        perror("setsockopt (stdin)");
                        perror("setsockopt (stdin)");

-               if (setsockopt(rfd2, SOL_SOCKET, SO_DEBUG, 0, 0) < 0)
+               if (setsockopt(rfd2, SOL_SOCKET, SO_DEBUG, &one, sizeof (one)) < 0)

                        perror("setsockopt (stderr)");
        }
        (void) setuid(getuid());
                        perror("setsockopt (stderr)");
        }
        (void) setuid(getuid());