From df80d21fdc13f93d9f5cc39a3525dd8698988a83 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Mon, 13 Jul 1998 16:38:47 +0000
Subject: Cleanup and bug fixes.

svn path=/trunk/; revision=1966
---
 rcfile_y.y | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'rcfile_y.y')

diff --git a/rcfile_y.y b/rcfile_y.y
index d08ef863..f3af36f8 100644
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -333,7 +333,7 @@ const flag securecheck;
 
     /* special cases useful for debugging purposes */
     if (strcmp("/dev/null", pathname) == 0)
-	return(0);
+	return(PS_SUCCESS);
 
     /* the run control file must have the same uid as the REAL uid of this 
        process, it must have permissions no greater than 600, and it must not 
@@ -341,7 +341,7 @@ const flag securecheck;
 
     if (lstat(pathname, &statbuf) < 0) {
 	if (errno == ENOENT) 
-	    return(0);
+	    return(PS_SUCCESS);
 	else {
 	    error(0, errno, "lstat: %s", pathname);
 	    return(PS_IOERR);
@@ -350,23 +350,26 @@ const flag securecheck;
 
     if (!securecheck)	return 0;
 
-    if ((statbuf.st_mode & S_IFLNK) == S_IFLNK) {
+    if ((statbuf.st_mode & S_IFLNK) == S_IFLNK)
+    {
 	fprintf(stderr, "File %s must not be a symbolic link.\n", pathname);
 	return(PS_AUTHFAIL);
     }
 
-    if (statbuf.st_mode & ~(S_IFREG | S_IREAD | S_IWRITE)) {
-	fprintf(stderr, "File %s must have no more than -rw------ (0600) permissions.\n", 
+    if (statbuf.st_mode & ~(S_IFREG | S_IREAD | S_IWRITE | S_IEXEC | S_IXGRP))
+    {
+	fprintf(stderr, "File %s must have no more than -rwx--x--- (0710) permissions.\n", 
 		pathname);
 	return(PS_AUTHFAIL);
     }
 
-    if (statbuf.st_uid != getuid()) {
+    if (statbuf.st_uid != getuid())
+    {
 	fprintf(stderr, "File %s must be owned by you.\n", pathname);
 	return(PS_AUTHFAIL);
     }
 #endif
-    return(0);
+    return(PS_SUCCESS);
 }
 
 int prc_parse_file (const char *pathname, const flag securecheck)
@@ -382,7 +385,7 @@ int prc_parse_file (const char *pathname, const flag securecheck)
 	return(prc_errflag);
 
     if (errno == ENOENT)
-	return(0);
+	return(PS_SUCCESS);
 
     /* Open the configuration and feed it to the lexer. */
     if ((yyin = fopen(pathname,"r")) == (FILE *)NULL) {
@@ -397,7 +400,7 @@ int prc_parse_file (const char *pathname, const flag securecheck)
     if (prc_errflag) 
 	return(PS_SYNTAX);
     else
-	return(0);
+	return(PS_SUCCESS);
 }
 
 static void reset_server(char *name, int skip)
-- 
cgit v1.2.3