From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Thu, 4 Sep 2014 13:08:32 +0000 (-0400)
Subject: Windows: replace lana_OnlyLoopback() calls
X-Git-Tag: upstream/1.8.0_pre1^2~579
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ec1dcfbe29961fad23dec087c2d214be785a7816;p=packages%2Fo%2Fopenafs.git

Windows: replace lana_OnlyLoopback() calls

lana_OnlyLoopback() relies upon Netbios over TCP being enabled but
Netbios over TCP is not officially supported on Vista and above.
Replace all lana_OnlyLoopback() calls with a test on the number of
network interfaces as computed by syscfg_GetIFInfo().   That list
excludes loopback interfaces.

Change-Id: I22d952f1487734ead02335108377bc404baa6024
Reviewed-on: http://gerrit.openafs.org/11444
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
---

diff --git a/src/WINNT/afsd/afsd_flushvol.c b/src/WINNT/afsd/afsd_flushvol.c
index 9539e2034..0a01f1bce 100644
--- a/src/WINNT/afsd/afsd_flushvol.c
+++ b/src/WINNT/afsd/afsd_flushvol.c
@@ -81,7 +81,7 @@ afsd_ServicePerformFlushVolumes()
     char        *pszShareName, *pc;
     afs_int32	afsRet = 0;
 
-    if ( lana_OnlyLoopback() ) {
+    if (cm_noIPAddr == 0) {
         // Nothing to do if we only have a loopback interface
         return TRUE;
     }
diff --git a/src/WINNT/afsd/afsd_service.c b/src/WINNT/afsd/afsd_service.c
index ea47debbf..e819f0e36 100644
--- a/src/WINNT/afsd/afsd_service.c
+++ b/src/WINNT/afsd/afsd_service.c
@@ -200,7 +200,7 @@ afsd_ServiceControlHandler(DWORD ctrlCode)
             afsi_log("SERVICE_CONTROL_SHUTDOWN");
 
         /* Write all dirty buffers back to server */
-	if ( !lana_OnlyLoopback() )
+	if (cm_noIPAddr > 0)
 	    buf_CleanAndReset();
 
         /* Force trace if requested */
@@ -282,7 +282,7 @@ afsd_ServiceControlHandlerEx(
 
         /* Write all dirty buffers back to server */
 	if (dwCurrentState == SERVICE_RUNNING &&
-            !lana_OnlyLoopback() )
+	     cm_noIPAddr > 0)
 	    buf_CleanAndReset();
 
         /* Force trace if requested */
@@ -342,7 +342,7 @@ afsd_ServiceControlHandlerEx(
                     afsi_log("SERVICE_CONTROL_APMQUERYSUSPEND");
                     osi_Log0(afsd_logp,"SERVICE_CONTROL_APMQUERYSUSPEND");
                     /* Write all dirty buffers back to server */
-		    if ( !lana_OnlyLoopback() )
+		    if (cm_noIPAddr > 0)
 			buf_CleanAndReset();
                     afsi_log("SERVICE_CONTROL_APMQUERYSUSPEND buf_CleanAndReset complete");
                     osi_Log0(afsd_logp,"SERVICE_CONTROL_APMQUERYSUSPEND buf_CleanAndReset complete");
@@ -352,7 +352,7 @@ afsd_ServiceControlHandlerEx(
                     afsi_log("SERVICE_CONTROL_APMQUERYSTANDBY");
                     osi_Log0(afsd_logp,"SERVICE_CONTROL_APMQUERYSTANDBY");
                     /* Write all dirty buffers back to server */
-		    if ( !lana_OnlyLoopback() )
+		    if (cm_noIPAddr > 0)
 			buf_CleanAndReset();
                     afsi_log("SERVICE_CONTROL_APMQUERYSTANDBY buf_CleanAndReset complete");
                     osi_Log0(afsd_logp,"SERVICE_CONTROL_APMQUERYSTANDBY buf_CleanAndReset complete");
diff --git a/src/WINNT/afsd/cm_scache.c b/src/WINNT/afsd/cm_scache.c
index 257689b17..f6aadde5c 100644
--- a/src/WINNT/afsd/cm_scache.c
+++ b/src/WINNT/afsd/cm_scache.c
@@ -703,7 +703,7 @@ cm_SuspendSCache(void)
     cm_scache_t * scp;
     time_t now;
 
-    if (!lana_OnlyLoopback())
+    if (cm_noIPAddr > 0)
 	cm_GiveUpAllCallbacksAllServersMulti(TRUE);
 
     /*
@@ -740,7 +740,7 @@ cm_ShutdownSCache(void)
 {
     cm_scache_t * scp, * nextp;
 
-    if (!lana_OnlyLoopback())
+    if (cm_noIPAddr > 0)
 	cm_GiveUpAllCallbacksAllServersMulti(FALSE);
 
     lock_ObtainWrite(&cm_scacheLock);