netrestrict-netinfo-20081129

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

diff --git a/src/bozo/bosserver.c b/src/bozo/bosserver.c
index 6593f88..f29ba8f 100644 (file)
--- a/src/bozo/bosserver.c
+++ b/src/bozo/bosserver.c
@@ -71,6 +71,7 @@ static afs_int32 nextDay;
 struct ktime bozo_nextRestartKT, bozo_nextDayKT;
 int bozo_newKTs;
 int rxBind = 0;
+int rxkadDisableDotCheck = 0;
 
 #define ADDRSPERSITE 16         /* Same global is in rx/rx_user.c */
 afs_uint32 SHostAddrs[ADDRSPERSITE];
@@ -513,8 +514,8 @@ bdrestart(register struct bnode *abnode, char *arock)
 
 #define        BOZO_MINSKIP 3600       /* minimum to advance clock */
 /* lwp to handle system restarts */
-static int
-BozoDaemon()
+static void *
+BozoDaemon(void *unused)
 {
     register afs_int32 now;
 
@@ -549,6 +550,7 @@ BozoDaemon()
            bnode_ApplyInstance(bdrestart, 0);
        }
     }
+    return NULL;
 }
 
 #ifdef AFS_AIX32_ENV
@@ -820,15 +822,18 @@ main(int argc, char **argv, char **envp)
        else if (strcmp(argv[code], "-rxbind") == 0) {
            rxBind = 1;
        }
-       else if (!strcmp(argv[i], "-rxmaxmtu")) {
-           if ((i + 1) >= argc) {
+       else if (strcmp(argv[code], "-allow-dotted-principals") == 0) {
+           rxkadDisableDotCheck = 1;
+       }
+       else if (!strcmp(argv[code], "-rxmaxmtu")) {
+           if ((code + 1) >= argc) {
                fprintf(stderr, "missing argument for -rxmaxmtu\n"); 
                exit(1); 
            }
-           rxMaxMTU = atoi(argv[++i]);
+           rxMaxMTU = atoi(argv[++code]);
            if ((rxMaxMTU < RX_MIN_PACKET_SIZE) || 
                (rxMaxMTU > RX_MAX_PACKET_DATA_SIZE)) {
-               printf("rxMaxMTU %d% invalid; must be between %d-%d\n",
+               printf("rxMaxMTU %d invalid; must be between %d-%d\n",
                        rxMaxMTU, RX_MIN_PACKET_SIZE, 
                        RX_MAX_PACKET_DATA_SIZE);
                exit(1);
@@ -871,14 +876,14 @@ main(int argc, char **argv, char **envp)
 #ifndef AFS_NT40_ENV
            printf("Usage: bosserver [-noauth] [-log] "
                   "[-auditlog <log path>] "
-                  "[-rxmaxmtu <bytes>] [-rxbind] "
+                  "[-rxmaxmtu <bytes>] [-rxbind] [-allow-dotted-principals]"
                   "[-syslog[=FACILITY]] "
                   "[-enable_peer_stats] [-enable_process_stats] "
                   "[-nofork] " "[-help]\n");
 #else
            printf("Usage: bosserver [-noauth] [-log] "
                   "[-auditlog <log path>] "
-                  "[-rxmaxmtu <bytes>] [-rxbind] "
+                  "[-rxmaxmtu <bytes>] [-rxbind] [-allow-dotted-principals]"
                   "[-enable_peer_stats] [-enable_process_stats] "
                   "[-help]\n");
 #endif
@@ -1036,7 +1041,6 @@ main(int argc, char **argv, char **envp)
 
     if (rxBind) {
        afs_int32 ccode;
-#ifndef AFS_NT40_ENV
         if (AFSDIR_SERVER_NETRESTRICT_FILEPATH || 
             AFSDIR_SERVER_NETINFO_FILEPATH) {
             char reason[1024];
@@ -1045,7 +1049,6 @@ main(int argc, char **argv, char **envp)
                                            AFSDIR_SERVER_NETINFO_FILEPATH,
                                            AFSDIR_SERVER_NETRESTRICT_FILEPATH);
         } else 
-#endif 
        {
             ccode = rx_getAllAddr(SHostAddrs, ADDRSPERSITE);
         }
@@ -1061,6 +1064,10 @@ main(int argc, char **argv, char **envp)
     rx_SetMinProcs(tservice, 2);
     rx_SetMaxProcs(tservice, 4);
     rx_SetStackSize(tservice, BOZO_LWP_STACKSIZE);     /* so gethostbyname works (in cell stuff) */
+    if (rxkadDisableDotCheck) {
+        rx_SetSecurityConfiguration(tservice, RXS_CONFIG_FLAGS,
+                                    (void *)RXS_CONFIG_FLAGS_DISABLE_DOTCHECK);
+    }
 
     tservice =
        rx_NewServiceHost(host, 0, RX_STATS_SERVICE_ID, "rpcstats", bozo_rxsc,
@@ -1068,6 +1075,7 @@ main(int argc, char **argv, char **envp)
     rx_SetMinProcs(tservice, 2);
     rx_SetMaxProcs(tservice, 4);
     rx_StartServer(1);         /* donate this process */
+    return 0;
 }
 
 void