Thus endeth the lie of /bin/csh

secret stealth option

diff --git a/clients/addusr/addusr.c b/clients/addusr/addusr.c
index 5554fe7eea8d0dc982938da49494978fa4f9ee8f..31584cc995fbe1b8e2cdfdd0190e180ca2fdbca5 100644 (file)
--- a/clients/addusr/addusr.c
+++ b/clients/addusr/addusr.c
@@ -24,6 +24,12 @@
 static char adduser_rcsid[] = "$Header$";
 #endif
 
+#ifdef ATHENA
+#define DEFAULT_SHELL "/bin/athena/tcsh"
+#else
+#define DEFAULT_SHELL "/bin/csh"
+#endif
+
 /* flags from command line */
 char *class, *comment, *status_str, *shell, *filename;
 int reg_only, reg, verbose, nodupcheck;
@@ -53,7 +59,7 @@ char **argv;
     reg_only = reg = verbose = lineno = nodupcheck = errors = 0;
     server = NULL;
     filename = "-";
-    shell = "/bin/csh";
+    shell = DEFAULT_SHELL;
     class = "TEMP";
     comment = "";
     status_str = "0";
@@ -102,7 +108,7 @@ char **argv;
              verbose++;
            else if (argis("d","nodupcheck"))
              nodupcheck++;
-           else if (argis("S","server"))
+           else if (argis("S","server") || argis("db","database"))
                if (arg - argv < argc - 1) {
                    ++arg;
                    server = *arg;
@@ -306,7 +312,7 @@ char **argv;
     fprintf(stderr, "   -c | -class class (default TEMP)\n");
     fprintf(stderr, "   -C | -comment \"comment\" (default \"\")\n");
     fprintf(stderr, "   -s | -status status (default 0)\n");
-    fprintf(stderr, "   -h | -shell shell (default /bin/csh)\n");
+    fprintf(stderr, "   -h | -shell shell (default %s)\n", DEFAULT_SHELL);
     fprintf(stderr, "   -r | -reg_only\n");
     fprintf(stderr, "   -R | -register (and add to database)\n");
     fprintf(stderr, "   -v | -verbose\n");