STABLE14-rxbind-for-servers-20060620

do not call parseNetFile on Windows where the function does not exist

(cherry picked from commit 7af6b06cb6611a8925e3fa887ddf0a03542ee4dc)

diff --git a/src/bozo/bosserver.c b/src/bozo/bosserver.c
index 286f10f29031de829a7ba908b91a5d85f0ed2e59..5db71a3b0e0eecc0ced8fa9796d10c33207281e7 100644 (file)
--- a/src/bozo/bosserver.c
+++ b/src/bozo/bosserver.c
@@ -1038,6 +1038,7 @@ 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 +1046,9 @@ main(int argc, char **argv, char **envp)
                                            ADDRSPERSITE, reason,
                                            AFSDIR_SERVER_NETINFO_FILEPATH,
                                            AFSDIR_SERVER_NETRESTRICT_FILEPATH);
-        } else {
+        } else 
+#endif 
+       {
             ccode = rx_getAllAddr(SHostAddrs, ADDRSPERSITE);
         }
         if (ccode == 1) 

diff --git a/src/budb/server.c b/src/budb/server.c
index ed7749ecae983574d52e2a0a227e7f27e3a2a679..d6d7fb6a3da9ff75607ff9133856bfcb6d4cf8b6 100644 (file)
--- a/src/budb/server.c
+++ b/src/budb/server.c
@@ -523,6 +523,7 @@ main(argc, argv)
 
     if (rxBind) {
        afs_int32 ccode;
+#ifndef AFS_NT40_ENV
         if (AFSDIR_SERVER_NETRESTRICT_FILEPATH || 
             AFSDIR_SERVER_NETINFO_FILEPATH) {
             char reason[1024];
@@ -530,7 +531,9 @@ main(argc, argv)
                                            ADDRSPERSITE, reason,
                                            AFSDIR_SERVER_NETINFO_FILEPATH,
                                            AFSDIR_SERVER_NETRESTRICT_FILEPATH);
-        } else {
+        } else 
+#endif 
+       {
             ccode = rx_getAllAddr(SHostAddrs, ADDRSPERSITE);
         }
         if (ccode == 1) {

diff --git a/src/butc/tcmain.c b/src/butc/tcmain.c
index 20229d735ec74f4d228d97e195f046b2dc3991c3..a9b719db5539f36c603c7ed6c70298e72af7dcde 100644 (file)
--- a/src/butc/tcmain.c
+++ b/src/butc/tcmain.c
@@ -1048,6 +1048,7 @@ WorkerBee(as, arock)
 
     if (rxBind) {
         afs_int32 ccode;
+#ifndef AFS_NT40_ENV
         if (AFSDIR_SERVER_NETRESTRICT_FILEPATH || 
             AFSDIR_SERVER_NETINFO_FILEPATH) {
             char reason[1024];
@@ -1055,7 +1056,9 @@ WorkerBee(as, arock)
                                            ADDRSPERSITE, reason,
                                            AFSDIR_SERVER_NETINFO_FILEPATH,
                                            AFSDIR_SERVER_NETRESTRICT_FILEPATH);
-        } else {
+        } else 
+#endif 
+       {
             ccode = rx_getAllAddr(SHostAddrs, ADDRSPERSITE);
         }
         if (ccode == 1) 

diff --git a/src/kauth/kaserver.c b/src/kauth/kaserver.c
index 7921d91a286962529929891051cf40d000bbf4a4..c4fc3cf213e012b5a7bf7e6d7a146123b0399731 100644 (file)
--- a/src/kauth/kaserver.c
+++ b/src/kauth/kaserver.c
@@ -387,6 +387,7 @@ main(argc, argv)
 
     if (rxBind) {
        afs_int32 ccode;
+#ifndef AFS_NT40_ENV
         if (AFSDIR_SERVER_NETRESTRICT_FILEPATH || 
             AFSDIR_SERVER_NETINFO_FILEPATH) {
             char reason[1024];
@@ -394,7 +395,9 @@ main(argc, argv)
                                            ADDRSPERSITE, reason,
                                            AFSDIR_SERVER_NETINFO_FILEPATH,
                                            AFSDIR_SERVER_NETRESTRICT_FILEPATH);
-        } else {
+        } else 
+#endif 
+       {
             ccode = rx_getAllAddr(SHostAddrs, ADDRSPERSITE);
         }
         if (ccode == 1) {

diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c
index 40137b6abeb261a4348c37b2479b5f38a6c03577..6e16d2f9924ed125ade527186d3ae94ca2b4385e 100644 (file)
--- a/src/ptserver/ptserver.c
+++ b/src/ptserver/ptserver.c
@@ -505,6 +505,7 @@ main(int argc, char **argv)
 
     if (rxBind) {
        afs_int32 ccode;
+#ifndef AFS_NT40_ENV
        if (AFSDIR_SERVER_NETRESTRICT_FILEPATH || 
            AFSDIR_SERVER_NETINFO_FILEPATH) {
            char reason[1024];
@@ -512,7 +513,9 @@ main(int argc, char **argv)
                                           ADDRSPERSITE, reason,
                                           AFSDIR_SERVER_NETINFO_FILEPATH,
                                           AFSDIR_SERVER_NETRESTRICT_FILEPATH);
-       } else {
+       } else 
+#endif
+       {
            ccode = rx_getAllAddr(SHostAddrs, ADDRSPERSITE);
        }
        if (ccode == 1) {

diff --git a/src/update/server.c b/src/update/server.c
index 6a206d7f20c5de1602bf606db449acd2e3b8d82e..7c2c958d9358a1fb3f51f89f7d4185a2682c4719 100644 (file)
--- a/src/update/server.c
+++ b/src/update/server.c
@@ -283,6 +283,7 @@ main(int argc, char *argv[])
 
     if (rxBind) {
        afs_int32 ccode;
+#ifndef AFS_NT40_ENV
         if (AFSDIR_SERVER_NETRESTRICT_FILEPATH || 
             AFSDIR_SERVER_NETINFO_FILEPATH) {
             char reason[1024];
@@ -290,7 +291,9 @@ main(int argc, char *argv[])
                                            ADDRSPERSITE, reason,
                                            AFSDIR_SERVER_NETINFO_FILEPATH,
                                            AFSDIR_SERVER_NETRESTRICT_FILEPATH);
-        } else {
+        } else 
+#endif 
+       {
             ccode = rx_getAllAddr(SHostAddrs, ADDRSPERSITE);
         }
         if (ccode == 1) 

diff --git a/src/vlserver/vlserver.c b/src/vlserver/vlserver.c
index e0a231961f81b14a78a37617d87c830f3e602512..280086769136ec1e28c9398aa6a3ca5b884d019e 100644 (file)
--- a/src/vlserver/vlserver.c
+++ b/src/vlserver/vlserver.c
@@ -333,6 +333,7 @@ main(argc, argv)
 
     if (rxBind) {
        afs_int32 ccode;
+#ifndef AFS_NT40_ENV
         if (AFSDIR_SERVER_NETRESTRICT_FILEPATH || 
             AFSDIR_SERVER_NETINFO_FILEPATH) {
             char reason[1024];
@@ -340,7 +341,9 @@ main(argc, argv)
                                  ADDRSPERSITE, reason,
                                  AFSDIR_SERVER_NETINFO_FILEPATH,
                                  AFSDIR_SERVER_NETRESTRICT_FILEPATH);
-        } else {
+        } else 
+#endif 
+       {
             ccode = rx_getAllAddr(SHostAddrs, ADDRSPERSITE);
         }
         if (ccode == 1) {

diff --git a/src/volser/volmain.c b/src/volser/volmain.c
index a783a03d3f651ff17a2afbccfeb3dd1c902c1302..cef3762b448d7e0ea505e110b8a553bab4affc5d 100644 (file)
--- a/src/volser/volmain.c
+++ b/src/volser/volmain.c
@@ -435,6 +435,7 @@ main(int argc, char **argv)
        rx_SetUdpBufSize(udpBufSize);   /* set the UDP buffer size for receive */
     if (rxBind) {
        afs_int32 ccode;
+#ifndef AFS_NT40_ENV
         if (AFSDIR_SERVER_NETRESTRICT_FILEPATH || 
             AFSDIR_SERVER_NETINFO_FILEPATH) {
             char reason[1024];
@@ -442,7 +443,9 @@ main(int argc, char **argv)
                                            ADDRSPERSITE, reason,
                                            AFSDIR_SERVER_NETINFO_FILEPATH,
                                            AFSDIR_SERVER_NETRESTRICT_FILEPATH);
-        } else {
+        } else 
+#endif 
+       {
             ccode = rx_getAllAddr(SHostAddrs, ADDRSPERSITE);
         }
         if (ccode == 1)