Remove weekly bosserver restarts

[openafs.git] / src / bozo / bosserver.c

diff --git a/src/bozo/bosserver.c b/src/bozo/bosserver.c
index 1215cea..6dc5e93 100644 (file)
--- a/src/bozo/bosserver.c
+++ b/src/bozo/bosserver.c
@@ -10,8 +10,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID
-    ("$Header$");
+#ifdef IGNORE_SOME_GCC_WARNINGS
+# pragma GCC diagnostic warning "-Wdeprecated-declarations"
+#endif
 
 #include <afs/stds.h>
 #include <sys/types.h>
@@ -41,7 +42,6 @@ RCSID
 #include "bosprototypes.h"
 #include <rx/rxkad.h>
 #include <rx/rxstat.h>
-#include <rx/rxstat_prototypes.h>
 #include <afs/keys.h>
 #include <afs/ktime.h>
 #include <afs/afsutil.h>
@@ -78,7 +78,6 @@ int rxkadDisableDotCheck = 0;
 #define ADDRSPERSITE 16         /* Same global is in rx/rx_user.c */
 afs_uint32 SHostAddrs[ADDRSPERSITE];
 
-#ifdef BOS_RESTRICTED_MODE
 int bozo_isrestricted = 0;
 int bozo_restdisable = 0;
 
@@ -89,7 +88,6 @@ bozo_insecureme(int sig)
     bozo_isrestricted = 0;
     bozo_restdisable = 1;
 }
-#endif
 
 struct bztemp {
     FILE *file;
@@ -281,9 +279,7 @@ ReadBozoFile(char *aname)
     afs_int32 i, goal;
     struct bnode *tb;
     char *parms[MAXPARMS];
-#ifdef BOS_RESTRICTED_MODE
     int rmode;
-#endif
 
     /* rename BozoInit to BosServer for the user */
     if (!aname) {
@@ -296,7 +292,6 @@ ReadBozoFile(char *aname)
            if (code < 0)
                perror("bosconfig rename");
        }
-#ifdef BOS_NEW_CONFIG
        if (access(AFSDIR_SERVER_BOZCONFNEW_FILEPATH, 0) == 0) {
            code =
                renamefile(AFSDIR_SERVER_BOZCONFNEW_FILEPATH,
@@ -304,14 +299,15 @@ ReadBozoFile(char *aname)
            if (code < 0)
                perror("bosconfig rename");
        }
-#endif
     }
 
-    /* setup default times we want to do restarts */
-    bozo_nextRestartKT.mask = KTIME_HOUR | KTIME_MIN | KTIME_DAY;
-    bozo_nextRestartKT.hour = 4;       /* 4 am */
+    /* don't do server restarts by default */
+    bozo_nextRestartKT.mask = KTIME_NEVER;
+    bozo_nextRestartKT.hour = 0;
     bozo_nextRestartKT.min = 0;
-    bozo_nextRestartKT.day = 0;        /* Sunday */
+    bozo_nextRestartKT.day = 0;
+
+    /* restart processes at 5am if their binaries have changed */
     bozo_nextDayKT.mask = KTIME_HOUR | KTIME_MIN;
     bozo_nextDayKT.hour = 5;
     bozo_nextDayKT.min = 0;
@@ -369,7 +365,7 @@ ReadBozoFile(char *aname)
            bozo_nextDayKT.sec = ktsec;
            continue;
        }
-#ifdef BOS_RESTRICTED_MODE
+
        if (strncmp(tbuffer, "restrictmode", 12) == 0) {
            code = sscanf(tbuffer, "restrictmode %d", &rmode);
            if (code != 1) {
@@ -383,7 +379,6 @@ ReadBozoFile(char *aname)
            bozo_isrestricted = rmode;
            continue;
        }
-#endif
 
        if (strncmp("bnode", tbuffer, 5) != 0) {
            code = -1;
@@ -468,9 +463,8 @@ WriteBozoFile(char *aname)
     if (!tfile)
        return -1;
     btemp.file = tfile;
-#ifdef BOS_RESTRICTED_MODE
+
     fprintf(tfile, "restrictmode %d\n", bozo_isrestricted);
-#endif
     fprintf(tfile, "restarttime %d %d %d %d %d\n", bozo_nextRestartKT.mask,
            bozo_nextRestartKT.day, bozo_nextRestartKT.hour,
            bozo_nextRestartKT.min, bozo_nextRestartKT.sec);
@@ -528,12 +522,11 @@ BozoDaemon(void *unused)
        IOMGR_Sleep(60);
        now = FT_ApproxTime();
 
-#ifdef BOS_RESTRICTED_MODE
        if (bozo_restdisable) {
            bozo_Log("Restricted mode disabled by signal\n");
            bozo_restdisable = 0;
        }
-#endif
+
        if (bozo_newKTs) {      /* need to recompute restart times */
            bozo_newKTs = 0;    /* done for a while */
            nextRestart = ktime_next(&bozo_nextRestartKT, BOZO_MINSKIP);
@@ -728,6 +721,7 @@ main(int argc, char **argv, char **envp)
     char namebuf[AFSDIR_PATH_MAX];
     int rxMaxMTU = -1;
     afs_uint32 host = htonl(INADDR_ANY);
+    char *auditFileName = NULL;
 #ifndef AFS_NT40_ENV
     int nofork = 0;
     struct stat sb;
@@ -754,9 +748,7 @@ main(int argc, char **argv, char **envp)
     sigaction(SIGABRT, &nsa, NULL);
 #endif
     osi_audit_init();
-#ifdef BOS_RESTRICTED_MODE
     signal(SIGFPE, bozo_insecureme);
-#endif
 
 #ifdef AFS_NT40_ENV
     /* Initialize winsock */
@@ -817,11 +809,9 @@ main(int argc, char **argv, char **envp)
        } else if (strcmp(argv[code], "-enable_process_stats") == 0) {
            rx_enableProcessRPCStats();
        }
-#ifdef BOS_RESTRICTED_MODE
        else if (strcmp(argv[code], "-restricted") == 0) {
            bozo_isrestricted = 1;
        }
-#endif
        else if (strcmp(argv[code], "-rxbind") == 0) {
            rxBind = 1;
        }
@@ -836,16 +826,22 @@ main(int argc, char **argv, char **envp)
            rxMaxMTU = atoi(argv[++code]);
            if ((rxMaxMTU < RX_MIN_PACKET_SIZE) || 
                (rxMaxMTU > RX_MAX_PACKET_DATA_SIZE)) {
-               printf("rxMaxMTU %d invalid; must be between %d-%lu\n",
+               printf("rxMaxMTU %d invalid; must be between %d-%" AFS_SIZET_FMT "\n",
                        rxMaxMTU, RX_MIN_PACKET_SIZE, 
                        RX_MAX_PACKET_DATA_SIZE);
                exit(1);
            }
        }
        else if (strcmp(argv[code], "-auditlog") == 0) {
-           char *fileName = argv[++code];
+           auditFileName = argv[++code];
 
-            osi_audit_file(fileName);
+       } else if (strcmp(argv[code], "-audit-interface") == 0) {
+           char *interface = argv[++code];
+
+           if (osi_audit_interface(interface)) {
+               printf("Invalid audit interface '%s'\n", interface);
+               exit(1);
+           }
        }
        else {
 
@@ -854,6 +850,7 @@ main(int argc, char **argv, char **envp)
 #ifndef AFS_NT40_ENV
            printf("Usage: bosserver [-noauth] [-log] "
                   "[-auditlog <log path>] "
+                  "[-audit-interafce <file|sysvmq> (default is file)] "
                   "[-rxmaxmtu <bytes>] [-rxbind] [-allow-dotted-principals]"
                   "[-syslog[=FACILITY]] "
                   "[-enable_peer_stats] [-enable_process_stats] "
@@ -861,6 +858,7 @@ main(int argc, char **argv, char **envp)
 #else
            printf("Usage: bosserver [-noauth] [-log] "
                   "[-auditlog <log path>] "
+                  "[-audit-interafce <file|sysvmq> (default is file)] "
                   "[-rxmaxmtu <bytes>] [-rxbind] [-allow-dotted-principals]"
                   "[-enable_peer_stats] [-enable_process_stats] "
                   "[-help]\n");
@@ -870,6 +868,9 @@ main(int argc, char **argv, char **envp)
            exit(0);
        }
     }
+    if (auditFileName) {
+       osi_audit_file(auditFileName);
+    }
 
 #ifndef AFS_NT40_ENV
     if (geteuid() != 0) {