Turn on --enable-bos-new-config unconditionally

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

diff --git a/src/bozo/bosserver.c b/src/bozo/bosserver.c
index 1215cea..4c5159e 100644 (file)
--- a/src/bozo/bosserver.c
+++ b/src/bozo/bosserver.c
@@ -10,8 +10,6 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID
-    ("$Header$");
 
 #include <afs/stds.h>
 #include <sys/types.h>
@@ -41,7 +39,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>
@@ -296,7 +293,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,7 +300,6 @@ ReadBozoFile(char *aname)
            if (code < 0)
                perror("bosconfig rename");
        }
-#endif
     }
 
     /* setup default times we want to do restarts */
@@ -728,6 +723,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;
@@ -843,9 +839,15 @@ main(int argc, char **argv, char **envp)
            }
        }
        else if (strcmp(argv[code], "-auditlog") == 0) {
-           char *fileName = argv[++code];
+           auditFileName = argv[++code];
+
+       } else if (strcmp(argv[code], "-audit-interface") == 0) {
+           char *interface = argv[++code];
 
-            osi_audit_file(fileName);
+           if (osi_audit_interface(interface)) {
+               printf("Invalid audit interface '%s'\n", interface);
+               exit(1);
+           }
        }
        else {
 
@@ -854,6 +856,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 +864,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 +874,9 @@ main(int argc, char **argv, char **envp)
            exit(0);
        }
     }
+    if (auditFileName) {
+       osi_audit_file(auditFileName);
+    }
 
 #ifndef AFS_NT40_ENV
     if (geteuid() != 0) {