ptserver: Fix argument aliases

[openafs.git] / src / ptserver / ptserver.c

diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c
index 86f240b..d7b6516 100644 (file)
--- a/src/ptserver/ptserver.c
+++ b/src/ptserver/ptserver.c
@@ -305,14 +305,14 @@ main(int argc, char **argv)
 /* ptserver specific options */
     cmd_AddParmAtOffset(opts, OPT_database, "-database", CMD_SINGLE,
                        CMD_OPTIONAL, "database file");
-    cmd_AddParmAlias(opts, OPT_database, "db");
+    cmd_AddParmAlias(opts, OPT_database, "-db");
 
     cmd_AddParmAtOffset(opts, OPT_access, "-default_access", CMD_SINGLE,
                        CMD_OPTIONAL, "default access flags for new entries");
 #if defined(SUPERGROUPS)
     cmd_AddParmAtOffset(opts, OPT_groupdepth, "-groupdepth", CMD_SINGLE,
                        CMD_OPTIONAL, "max search depth for supergroups");
-    cmd_AddParmAlias(opts, OPT_groupdepth, "depth");
+    cmd_AddParmAlias(opts, OPT_groupdepth, "-depth");
 #endif
     cmd_AddParmAtOffset(opts, OPT_restricted, "-restricted", CMD_FLAG,
                        CMD_OPTIONAL, "enable restricted mode");
@@ -354,6 +354,11 @@ main(int argc, char **argv)
     if (code)
        PT_EXIT(1);
 
+    cmd_OptionAsString(opts, OPT_config, &configDir);
+
+    cmd_OpenConfigFile(AFSDIR_SERVER_CONFIG_FILE_FILEPATH);
+    cmd_SetCommandName("ptserver");
+
     if (cmd_OptionAsList(opts, OPT_access, &list) == 0) {
        prp_user_default = prp_access_mask(list->data);
        if (list->next == NULL || list->next->data == NULL) {
@@ -380,16 +385,15 @@ main(int argc, char **argv)
        free(interface);
     }
 
-    cmd_OptionAsString(opts, OPT_config, &configDir);
     cmd_OptionAsInt(opts, OPT_debug, &LogLevel);
     cmd_OptionAsString(opts, OPT_database, &pr_dbaseName);
     cmd_OptionAsString(opts, OPT_logfile, &logFile);
 
     if (cmd_OptionAsInt(opts, OPT_threads, &lwps) == 0) {
-       if (lwps > 16) {        /* maximum of 16 */
+       if (lwps > 64) {        /* maximum of 64 */
            printf("Warning: '-p %d' is too big; using %d instead\n",
-                  lwps, 16);
-           lwps = 16;
+                  lwps, 64);
+           lwps = 64;
        } else if (lwps < 3) {  /* minimum of 3 */
            printf("Warning: '-p %d' is too small; using %d instead\n",
                   lwps, 3);
@@ -488,10 +492,10 @@ main(int argc, char **argv)
        if (AFSDIR_SERVER_NETRESTRICT_FILEPATH ||
            AFSDIR_SERVER_NETINFO_FILEPATH) {
            char reason[1024];
-           ccode = parseNetFiles(SHostAddrs, NULL, NULL,
-                                          ADDRSPERSITE, reason,
-                                          AFSDIR_SERVER_NETINFO_FILEPATH,
-                                          AFSDIR_SERVER_NETRESTRICT_FILEPATH);
+           ccode = afsconf_ParseNetFiles(SHostAddrs, NULL, NULL,
+                                         ADDRSPERSITE, reason,
+                                         AFSDIR_SERVER_NETINFO_FILEPATH,
+                                         AFSDIR_SERVER_NETRESTRICT_FILEPATH);
        } else
        {
            ccode = rx_getAllAddr(SHostAddrs, ADDRSPERSITE);
@@ -564,6 +568,9 @@ main(int argc, char **argv)
                   "1.0",
 #endif
                   "Starting AFS", FSLog);
+    if (afsconf_GetLatestKey(prdir, NULL, NULL) == 0) {
+       LogDesWarning();
+    }
 
     rx_StartServer(1);
     osi_audit(PTS_FinishEvent, -1, AUD_END);