compare return value from getopt against -1 rather than EOF, per the final

[pw-darwin.git] / chpass / field.c

diff --git a/chpass/field.c b/chpass/field.c
index 898ba4d6adcd765002b6571662834f53447725e5..73fa4795a2e07d7aff682331bd91625202cfb524 100644 (file)
--- a/chpass/field.c
+++ b/chpass/field.c
@@ -36,6 +36,7 @@ static char sccsid[] = "@(#)field.c   8.4 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/param.h>
+#include <sys/stat.h>
 
 #include <ctype.h>
 #include <err.h>
@@ -92,7 +93,7 @@ p_passwd(p, pw, ep)
                warnx("can't save password entry");
                return (1);
        }
-       
+
        return (0);
 }
 
@@ -170,7 +171,7 @@ p_class(p, pw, ep)
                warnx("can't save entry");
                return (1);
        }
-       
+
        return (0);
 }
 
@@ -242,6 +243,7 @@ p_shell(p, pw, ep)
        ENTRY *ep;
 {
        char *t, *ok_shell();
+       struct stat sbuf;
 
        if (!*p) {
                pw->pw_shell = _PATH_BSHELL;
@@ -264,5 +266,22 @@ p_shell(p, pw, ep)
                warnx("can't save entry");
                return (1);
        }
+       if (stat(pw->pw_shell, &sbuf) < 0) {
+               if (errno == ENOENT)
+                       warnx("WARNING: shell '%s' does not exist",
+                           pw->pw_shell);
+               else
+                       warn("WARNING: can't stat shell '%s'",  pw->pw_shell);
+               return (0);
+       }
+       if (!S_ISREG(sbuf.st_mode)) {
+               warnx("WARNING: shell '%s' is not a regular file", 
+                       pw->pw_shell);
+               return (0);
+       }
+       if ((sbuf.st_mode & (S_IXOTH | S_IXGRP | S_IXUSR)) == 0) {
+               warnx("WARNING: shell '%s' is not executable", pw->pw_shell);
+               return (0);
+       }
        return (0);
 }