windows-client-config-cell-search-registry-20090616

LICENSE MIT

Add registry based cell search functionality to afs_config.exe
even though the tool is close to useless at this point.

diff --git a/src/WINNT/client_config/tab_general.cpp b/src/WINNT/client_config/tab_general.cpp
index 5f245940161610a1b7f088295177a7534969e5c9..3fe83effa131d93b9cabba56ccbbc3fdaaf71a75 100644 (file)
--- a/src/WINNT/client_config/tab_general.cpp
+++ b/src/WINNT/client_config/tab_general.cpp
@@ -13,6 +13,7 @@
 extern "C" {
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <afs/cm.h>
 #include <rx/rxkad.h>
 #include <afs/cm_config.h>
 }
@@ -662,8 +663,19 @@ BOOL fIsCellInCellServDB (LPCTSTR pszCell)
 {
    BOOL fFound = FALSE;
    CELLSERVDB CellServDB;
-
-   if (CSDB_ReadFile (&CellServDB, NULL))
+   char cellname[256], i;
+
+   /* we pray for all ascii cellnames */
+   for ( i=0 ; pszCell[i] && i < (sizeof(cellname)-1) ; i++ )
+       cellname[i] = pszCell[i];
+   cellname[i] = '\0';
+
+   ULONG code = cm_SearchCellRegistry(1, cellname, NULL, NULL, NULL, NULL);
+   if (code == 0)
+      fFound = TRUE;
+   if (!fFound && 
+       (code != CM_ERROR_FORCE_DNS_LOOKUP) && 
+       CSDB_ReadFile (&CellServDB, NULL))
    {
        if (CSDB_FindCell (&CellServDB, pszCell))
            fFound = TRUE;
@@ -672,16 +684,11 @@ BOOL fIsCellInCellServDB (LPCTSTR pszCell)
 #ifdef AFS_AFSDB_ENV
     if ( fFound == FALSE ) {
         int ttl;
-        char cellname[128], i;
-
-        /* we pray for all ascii cellnames */
-        for ( i=0 ; pszCell[i] && i < (sizeof(cellname)-1) ; i++ )
-            cellname[i] = pszCell[i];
-        cellname[i] = '\0';
-
         fFound = !cm_SearchCellByDNS(cellname, NULL, &ttl, NULL, NULL);
     }
 #endif
+     done:
+
    return fFound;
 }
 

diff --git a/src/WINNT/client_config/tab_hosts.cpp b/src/WINNT/client_config/tab_hosts.cpp
index 8a4927482a37c034f918a312e660985dcc96c2c7..4859d9c20e4ab9f294ea2795bd818e5e749574a6 100644 (file)
--- a/src/WINNT/client_config/tab_hosts.cpp
+++ b/src/WINNT/client_config/tab_hosts.cpp
@@ -13,6 +13,7 @@
 extern "C" {
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <afs/cm.h>
 #include <afs/cm_config.h>
 }
 
@@ -183,17 +184,20 @@ BOOL HostsTab_OnApply (HWND hDlg)
          return FALSE;
          }
 
-      if (!CSDB_FindCell (&g.Configuration.CellServDB, szCell))
+      char cellname[256], i;
+
+      /* we pray for all ascii cellnames */
+      for ( i=0 ; szCell[i] && i < (sizeof(cellname)-1) ; i++ )
+          cellname[i] = szCell[i];
+      cellname[i] = '\0';
+
+      ULONG code = cm_SearchCellRegistry(1, cellname, NULL, NULL, NULL, NULL);
+      if (code && 
+          code != CM_ERROR_FORCE_DNS_LOOKUP &&
+          !CSDB_FindCell (&g.Configuration.CellServDB, szCell))
          {
 #ifdef AFS_AFSDB_ENV
              int ttl;
-             char cellname[128], i;
-
-             /* we pray for all ascii cellnames */
-             for ( i=0 ; szCell[i] && i < (sizeof(cellname)-1) ; i++ )
-                 cellname[i] = szCell[i];
-             cellname[i] = '\0';
-
              if (cm_SearchCellByDNS(cellname, NULL, &ttl, NULL, NULL))
 #endif
              {