kas: Don't require config for help

[openafs.git] / src / kauth / kas.c

diff --git a/src/kauth/kas.c b/src/kauth/kas.c
index 3ebd084..027b448 100644 (file)
--- a/src/kauth/kas.c
+++ b/src/kauth/kas.c
@@ -1,102 +1,106 @@
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
- * 
+ *
  * This software has been released under the terms of the IBM Public
  * License.  For details, see the LICENSE file in the top-level source
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
 /* These two needed for rxgen output to work */
-#include <afs/param.h>
 #include <afsconfig.h>
+#include <afs/param.h>
+#include <afs/stds.h>
 
-RCSID("$Header$");
+#include <roken.h>
 
-#include <afs/stds.h>
-#ifdef AFS_AIX32_ENV
-#include <signal.h>
+#ifdef AFS_NT40_ENV
+#include <WINNT/afsevent.h>
 #endif
 
-#include <sys/types.h>
 #include <rx/xdr.h>
-
 #include <lock.h>
 #include <ubik.h>
-#ifndef AFS_NT40_ENV
-#include <pwd.h>
-#else
-#include <WINNT/afsevent.h>
-#endif
 #include <afs/cellconfig.h>
 #include <afs/com_err.h>
+#include <afs/cmd.h>
 
 #include "kauth.h"
+#include "kauth_internal.h"
 #include "kautils.h"
 
-
-int main (
-  int   argc,
-  char *argv[])
+int
+main(int argc, char *argv[])
 {
     afs_int32 code;
     char *ap[25];
-    int   i;
+    int i;
     char *whoami = argv[0];
 
 #ifdef AFS_AIX32_ENV
     /*
-     * The following signal action for AIX is necessary so that in case of a 
-     * crash (i.e. core is generated) we can include the user's data section 
+     * The following signal action for AIX is necessary so that in case of a
+     * crash (i.e. core is generated) we can include the user's data section
      * in the core dump. Unfortunately, by default, only a partial core is
      * generated which, in many cases, isn't too useful.
      */
     struct sigaction nsa;
-    
+
     sigemptyset(&nsa.sa_mask);
     nsa.sa_handler = SIG_DFL;
     nsa.sa_flags = SA_FULLDUMP;
     sigaction(SIGABRT, &nsa, NULL);
     sigaction(SIGSEGV, &nsa, NULL);
 #endif
-    initialize_cmd_error_table();
-    initialize_ktc_error_table();
-    initialize_ka_error_table();
-    initialize_acfg_error_table();
-    initialize_u_error_table();
+    initialize_CMD_error_table();
+    initialize_KTC_error_table();
+    initialize_KA_error_table();
+    initialize_ACFG_error_table();
+    initialize_U_error_table();
 
 #ifdef AFS_NT40_ENV
     /* initialize winsock */
-    if (afs_winsockInit()<0) {
-      fprintf(stderr, "%s: Couldn't initialize winsock.\n", whoami);
-      exit(1);
+    if (afs_winsockInit() < 0) {
+       fprintf(stderr, "%s: Couldn't initialize winsock.\n", whoami);
+       exit(1);
     }
 #endif
 
-    code = ka_Init(0);
-    if (code) {
-       com_err (whoami, code, "Can't get cell info");
-       exit (1);
+    /* Don't ka_Init if we're just returning help output. */
+    if (argc== 0 ||
+         ( strcmp(argv[1], "-help") != 0 &&
+          strcmp(argv[1], "help") != 0 &&
+          strcmp(argv[1], "-version") != 0 &&
+          strcmp(argv[1], "version") !=0 &&
+          strcmp(argv[1],"apropos") != 0)) {
+       code = ka_Init(0);
+       if (code) {
+           afs_com_err(whoami, code, "Can't get cell info");
+           exit(1);
+       }
     }
 
     /* if there are no arguments or if the first argument is "-cell" or if the
-       first argument is clearly a username (it contains a '.' or '@') assume
-       the interactive command and splice it into the arglist. */
+     * first argument is clearly a username (it contains a '.' or '@') assume
+     * the interactive command and splice it into the arglist. */
 
     ap[0] = argv[0];
     ap[1] = "interactive";
-    if (argc == 1) code = ka_AdminInteractive (2, ap);
-    else if ((strncmp (argv[1], "-admin_username", strlen(argv[1])) == 0) ||
-            (strncmp (argv[1], "-password_for_admin", strlen(argv[1])) == 0) ||
-            (strncmp (argv[1], "-cell", strlen(argv[1])) == 0) ||
-            (strncmp (argv[1], "-servers", strlen(argv[1])) == 0) ||
-            (strncmp (argv[1], "-noauth", strlen(argv[1])) == 0) ||
-            (strpbrk (argv[1], "@.") != 0)) {
-       for (i=1; i<argc; i++) ap[i+1] = argv[i];
-       code = ka_AdminInteractive (argc+1, ap);
-    }
-    else code = ka_AdminInteractive (argc, argv);
+    if (argc == 1)
+       code = ka_AdminInteractive(2, ap);
+    else if ((strncmp(argv[1], "-admin_username", strlen(argv[1])) == 0)
+            || (strncmp(argv[1], "-password_for_admin", strlen(argv[1])) ==
+                0)
+            || (strncmp(argv[1], "-cell", strlen(argv[1])) == 0)
+            || (strncmp(argv[1], "-servers", strlen(argv[1])) == 0)
+            || (strncmp(argv[1], "-noauth", strlen(argv[1])) == 0)
+            || (strpbrk(argv[1], "@.") != 0)) {
+       for (i = 1; i < argc; i++)
+           ap[i + 1] = argv[i];
+       code = ka_AdminInteractive(argc + 1, ap);
+    } else
+       code = ka_AdminInteractive(argc, argv);
 
     rx_Finalize();
-    exit (code != 0);
+    exit(code != 0);
 }