bozo: fix typo in help text

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

diff --git a/src/bozo/bosserver.c b/src/bozo/bosserver.c
index bc4993b..59df3f1 100644 (file)
--- a/src/bozo/bosserver.c
+++ b/src/bozo/bosserver.c
@@ -268,16 +268,14 @@ ReadBozoFile(char *aname)
        /* if BozoInit exists and BosConfig doesn't, try a rename */
        if (access(AFSDIR_SERVER_BOZINIT_FILEPATH, 0) == 0
            && access(AFSDIR_SERVER_BOZCONF_FILEPATH, 0) != 0) {
-           code =
-               renamefile(AFSDIR_SERVER_BOZINIT_FILEPATH,
-                          AFSDIR_SERVER_BOZCONF_FILEPATH);
+           code = rk_rename(AFSDIR_SERVER_BOZINIT_FILEPATH,
+                            AFSDIR_SERVER_BOZCONF_FILEPATH);
            if (code < 0)
                perror("bosconfig rename");
        }
        if (access(AFSDIR_SERVER_BOZCONFNEW_FILEPATH, 0) == 0) {
-           code =
-               renamefile(AFSDIR_SERVER_BOZCONFNEW_FILEPATH,
-                          AFSDIR_SERVER_BOZCONF_FILEPATH);
+           code = rk_rename(AFSDIR_SERVER_BOZCONFNEW_FILEPATH,
+                            AFSDIR_SERVER_BOZCONF_FILEPATH);
            if (code < 0)
                perror("bosconfig rename");
        }
@@ -466,7 +464,7 @@ WriteBozoFile(char *aname)
        unlink(tbuffer);
        return -1;
     }
-    code = renamefile(tbuffer, aname);
+    code = rk_rename(tbuffer, aname);
     if (code) {
        unlink(tbuffer);
        return -1;
@@ -769,16 +767,17 @@ bozo_CreateRxBindFile(afs_uint32 host)
     char buffer[16];
     FILE *fp;
 
-    if (host == htonl(INADDR_ANY)) {
-       host = htonl(0x7f000001);
-    }
-
     afs_inet_ntoa_r(host, buffer);
     bozo_Log("Listening on %s:%d\n", buffer, AFSCONF_NANNYPORT);
     if ((fp = fopen(AFSDIR_SERVER_BOZRXBIND_FILEPATH, "w")) == NULL) {
        bozo_Log("Unable to open rxbind address file: %s, code=%d\n",
                 AFSDIR_SERVER_BOZRXBIND_FILEPATH, errno);
     } else {
+       /* If listening on any interface, write the loopback interface
+          to the rxbind file to give local scripts a usable addresss. */
+       if (host == htonl(INADDR_ANY)) {
+           afs_inet_ntoa_r(htonl(0x7f000001), buffer);
+       }
        fprintf(fp, "%s\n", buffer);
        fclose(fp);
     }
@@ -948,7 +947,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)] "
+                  "[-audit-interface <file|sysvmq> (default is file)] "
                   "[-rxmaxmtu <bytes>] [-rxbind] [-allow-dotted-principals]"
                   "[-syslog[=FACILITY]] "
                   "[-restricted] "
@@ -959,7 +958,7 @@ main(int argc, char **argv, char **envp)
 #else
            printf("Usage: bosserver [-noauth] [-log] "
                   "[-auditlog <log path>] "
-                  "[-audit-interafce <file|sysvmq> (default is file)] "
+                  "[-audit-interface <file|sysvmq> (default is file)] "
                   "[-rxmaxmtu <bytes>] [-rxbind] [-allow-dotted-principals]"
                   "[-restricted] "
                   "[-enable_peer_stats] [-enable_process_stats] "
@@ -1025,7 +1024,7 @@ main(int argc, char **argv, char **envp)
        ) {
        strcpy(namebuf, AFSDIR_BOZLOG_FILE);
        strcat(namebuf, ".old");
-       renamefile(AFSDIR_BOZLOG_FILE, namebuf);        /* try rename first */
+       rk_rename(AFSDIR_BOZLOG_FILE, namebuf); /* try rename first */
        bozo_logFile = fopen(AFSDIR_BOZLOG_FILE, "a");
        if (!bozo_logFile) {
            printf("bosserver: can't initialize log file (%s).\n",
@@ -1062,10 +1061,10 @@ main(int argc, char **argv, char **envp)
        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);
         }