#include <roken.h>
#include <afs/opr.h>
+#ifdef AFS_PTHREAD_ENV
+# include <opr/softsig.h>
+# include <afs/procmgmt_softsig.h> /* must come after softsig.h */
+#endif
#ifdef AFS_NT40_ENV
#include <WINNT/afsevent.h>
extern afs_int32 depthsg;
#endif
-char *pr_realmName;
-
int restricted = 0;
+int restrict_anonymous = 0;
int rxMaxMTU = -1;
int rxBind = 0;
int rxkadDisableDotCheck = 0;
OPT_access,
OPT_groupdepth,
OPT_restricted,
+ OPT_restrict_anonymous,
OPT_auditlog,
OPT_auditiface,
OPT_config,
cmd_DisableAbbreviations();
cmd_DisablePositionalCommands();
- opts = cmd_CreateSyntax(NULL, NULL, NULL, NULL);
+ opts = cmd_CreateSyntax(NULL, NULL, NULL, 0, NULL);
/* 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_AddParmAtOffset(opts, OPT_access, "-default_access", CMD_LIST,
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");
+ cmd_AddParmAtOffset(opts, OPT_restrict_anonymous, "-restrict_anonymous",
+ CMD_FLAG, CMD_OPTIONAL, "enable restricted anonymous mode");
/* general server options */
cmd_AddParmAtOffset(opts, OPT_auditlog, "-auditlog", CMD_SINGLE,
"permit Kerberos 5 principals with dots");
code = cmd_Parse(argc, argv, &opts);
+ if (code == CMD_HELP) {
+ PT_EXIT(0);
+ }
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) {
#endif
cmd_OptionAsFlag(opts, OPT_restricted, &restricted);
+ cmd_OptionAsFlag(opts, OPT_restrict_anonymous, &restrict_anonymous);
/* general server options */
cmd_OptionAsString(opts, OPT_auditlog, &auditFileName);
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);
serverLogSyslogTag = "ptserver";
#endif
OpenLog(logFile); /* set up logging */
+#ifdef AFS_PTHREAD_ENV
+ opr_softsig_Init();
+ SetupLogSoftSignals();
+#else
SetupLogSignals();
+#endif
prdir = afsconf_Open(configDir);
if (!prdir) {
afs_com_err(whoami, code, "Couldn't get server list");
PT_EXIT(2);
}
- pr_realmName = info.name;
/* initialize audit user check */
- osi_audit_set_user_check(configDir, pr_IsLocalRealmMatch);
+ osi_audit_set_user_check(prdir, pr_IsLocalRealmMatch);
/* initialize ubik */
ubik_SetClientSecurityProcs(afsconf_ClientAuth, afsconf_UpToDate, prdir);
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);
}
}
+ /* Disable jumbograms */
+ rx_SetNoJumbo();
+
+ if (rxMaxMTU != -1) {
+ if (rx_SetMaxMTU(rxMaxMTU) != 0) {
+ printf("rxMaxMTU %d is invalid\n", rxMaxMTU);
+ PT_EXIT(1);
+ }
+ }
+
code =
ubik_ServerInitByInfo(myHost, htons(AFSCONF_PROTPORT), &info, clones,
pr_dbaseName, &dbase);
afsconf_BuildServerSecurityObjects(prdir, &securityClasses, &numClasses);
- /* Disable jumbograms */
- rx_SetNoJumbo();
-
- if (rxMaxMTU != -1) {
- if (rx_SetMaxMTU(rxMaxMTU) != 0) {
- printf("rxMaxMTU %d is invalid\n", rxMaxMTU);
- PT_EXIT(1);
- }
- }
-
tservice =
rx_NewServiceHost(host, 0, PRSRV, "Protection Server", securityClasses,
numClasses, PR_ExecuteRequest);
"1.0",
#endif
"Starting AFS", FSLog);
+ if (afsconf_GetLatestKey(prdir, NULL, NULL) == 0) {
+ LogDesWarning();
+ }
rx_StartServer(1);
osi_audit(PTS_FinishEvent, -1, AUD_END);