From: Jeffrey Altman <jaltman@mit.edu>
Date: Fri, 27 Feb 2004 20:38:48 +0000 (+0000)
Subject: NoFindLanaByName-regkey-20040227
X-Git-Tag: openafs-devel-1_3_60~85
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=d10a43683ae0beb844275f960f6dae26f31bd64a;p=packages%2Fo%2Fopenafs.git

NoFindLanaByName-regkey-20040227


Add a new registry entry "NoFindLanaByName" which can be set to 0x01 (DWORD)
to disable the FindLanaByName lookup in case it crashes
---

diff --git a/src/WINNT/afsd/afsd_init.c b/src/WINNT/afsd/afsd_init.c
index 0b2112434..03c21548e 100644
--- a/src/WINNT/afsd/afsd_init.c
+++ b/src/WINNT/afsd/afsd_init.c
@@ -708,17 +708,32 @@ int afsd_InitSMB(char **reasonP, void *aMBfunc)
 {
 	char hostName[200];
 	char *ctemp;
-    lana_number_t lana;
+    lana_number_t lana = LANA_INVALID;
 
 	/* Do this last so that we don't handle requests before init is done.
      * Here we initialize the SMB listener.
      */
     if (LANadapter == -1) {
+        DWORD noFindByName = 0;
+        HKEY parmKey;
+        DWORD dummyLen;
+        long code;
+
         /* Find the default LAN adapter to use.  First look for
          * the adapter named AFS; otherwise, unless we are doing
          * gateway service, look for any valid loopback adapter.
          */
-        lana = lana_FindLanaByName("AFS");
+        code = RegOpenKeyEx(HKEY_LOCAL_MACHINE, AFSConfigKeyName,
+                             0, KEY_QUERY_VALUE, &parmKey);
+        if (code == ERROR_SUCCESS) {
+            dummyLen = sizeof(LANadapter);
+            code = RegQueryValueEx(parmKey, "NoFindLanaByName", NULL, NULL,
+                                    (BYTE *) &noFindByName, &dummyLen);
+            RegCloseKey(parmKey);
+        }
+
+        if ( !noFindByName )
+            lana = lana_FindLanaByName("AFS");
         if (lana == LANA_INVALID && !isGateway)
             lana = lana_FindLoopback();
         if (lana != LANA_INVALID)