BSD 4_4 release

[unix-history] / usr / src / usr.bin / ftp / ruserpass.c

diff --git a/usr/src/usr.bin/ftp/ruserpass.c b/usr/src/usr.bin/ftp/ruserpass.c
index 4f4bea1..1247b8d 100644 (file)
--- a/usr/src/usr.bin/ftp/ruserpass.c
+++ b/usr/src/usr.bin/ftp/ruserpass.c
@@ -1,12 +1,38 @@
 /*
 /*

- * Copyright (c) 1985 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1985, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)ruserpass.c        5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)ruserpass.c        8.1 (Berkeley) 6/6/93";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>


@@ -53,7 +79,7 @@ ruserpass(host, aname, apass, aacct)
        char myname[MAXHOSTNAMELEN], *mydomain;
        int t, i, c, usedefault = 0;
        struct stat stb;
        char myname[MAXHOSTNAMELEN], *mydomain;
        int t, i, c, usedefault = 0;
        struct stat stb;

-       extern int errno;
+       static int token();

 
        hdir = getenv("HOME");
        if (hdir == NULL)
 
        hdir = getenv("HOME");
        if (hdir == NULL)


@@ -118,8 +144,9 @@ next:
                        if (strcmp(*aname, "anonymous") &&
                            fstat(fileno(cfile), &stb) >= 0 &&
                            (stb.st_mode & 077) != 0) {
                        if (strcmp(*aname, "anonymous") &&
                            fstat(fileno(cfile), &stb) >= 0 &&
                            (stb.st_mode & 077) != 0) {

-       fprintf(stderr, "Error - .netrc file not correct mode.\n");
-       fprintf(stderr, "Remove password or correct mode.\n");
+       fprintf(stderr, "Error: .netrc file is readable by others.\n");
+       fprintf(stderr, 
+               "Remove password or make file unreadable by others.\n\n");

                                goto bad;
                        }
                        if (token() && *apass == 0) {
                                goto bad;
                        }
                        if (token() && *apass == 0) {


@@ -130,8 +157,9 @@ next:
                case ACCOUNT:
                        if (fstat(fileno(cfile), &stb) >= 0
                            && (stb.st_mode & 077) != 0) {
                case ACCOUNT:
                        if (fstat(fileno(cfile), &stb) >= 0
                            && (stb.st_mode & 077) != 0) {

-       fprintf(stderr, "Error - .netrc file not correct mode.\n");
-       fprintf(stderr, "Remove account or correct mode.\n");
+       fprintf(stderr, "Error: .netrc file is readable by others.\n");
+       fprintf(stderr, 
+               "Remove account or make file unreadable by others.\n\n");

                                goto bad;
                        }
                        if (token() && *aacct == 0) {
                                goto bad;
                        }
                        if (token() && *aacct == 0) {


@@ -219,7 +247,7 @@ token()
        int c;
        struct toktab *t;
 
        int c;
        struct toktab *t;
 

-       if (feof(cfile))
+       if (feof(cfile) || ferror(cfile))

                return (0);
        while ((c = getc(cfile)) != EOF &&
            (c == '\n' || c == '\t' || c == ' ' || c == ','))
                return (0);
        while ((c = getc(cfile)) != EOF &&
            (c == '\n' || c == '\t' || c == ' ' || c == ','))