From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Tue, 20 Jun 2006 21:37:10 +0000 (+0000)
Subject: DEVEL15-rxbind-for-servers-20060620
X-Git-Tag: openafs-devel-1_5_3~53
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8a9d6bfa5bb6a5c53c48f2da55eefd7591d9e9f7;p=packages%2Fo%2Fopenafs.git

DEVEL15-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 b82c1a6a3..a22546d1b 100644
--- a/src/bozo/bosserver.c
+++ b/src/bozo/bosserver.c
@@ -1039,6 +1039,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];
@@ -1046,7 +1047,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 ed7749eca..d6d7fb6a3 100644
--- 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 20229d735..a9b719db5 100644
--- 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 7921d91a2..c4fc3cf21 100644
--- 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 e472fd5c5..463f5d9aa 100644
--- a/src/ptserver/ptserver.c
+++ b/src/ptserver/ptserver.c
@@ -504,6 +504,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];
@@ -511,7 +512,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 6a206d7f2..7c2c958d9 100644
--- 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 e0a231961..280086769 100644
--- 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 a783a03d3..cef3762b4 100644
--- 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)