From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Mon, 23 Feb 2009 14:28:49 +0000 (+0000)
Subject: DEVEL15-windows-getrootcellname-20090223
X-Git-Tag: openafs-devel-1_5_58~131
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=32674c098a575c8f64bc4733446e63581e7371f1;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-getrootcellname-20090223

LICENSE MIT

do not mix and match CELL_MAXNAMELEN and MAXCELLCHARS.  They are
not the same.


(cherry picked from commit 80faa5e93ddc95ca676aa31f5d3522ad6b67f67e)
---

diff --git a/src/WINNT/afsd/afskfw.c b/src/WINNT/afsd/afskfw.c
index f0b024f82..7653574fb 100644
--- a/src/WINNT/afsd/afskfw.c
+++ b/src/WINNT/afsd/afskfw.c
@@ -447,7 +447,7 @@ KFW_initialize(void)
             LoadFuncs(CCAPI_DLL, ccapi_fi, &hCCAPI, 0, 1, 0, 0);
 
             if ( KFW_is_available() ) {
-                char rootcell[MAXCELLCHARS+1];
+                char rootcell[CELL_MAXNAMELEN+1];
 #ifdef USE_MS2MIT
                 KFW_import_windows_lsa();
 #endif /* USE_MS2MIT */
diff --git a/src/WINNT/afsd/cm_config.c b/src/WINNT/afsd/cm_config.c
index b15f9738d..c153066b5 100644
--- a/src/WINNT/afsd/cm_config.c
+++ b/src/WINNT/afsd/cm_config.c
@@ -394,7 +394,10 @@ long cm_GetCellServDB(char *cellNamep, afs_uint32 len)
     return 0;
 }
 
-/* look up the root cell's name in the Registry */
+/* look up the root cell's name in the Registry 
+ * Input buffer must be at least CELL_MAXNAMELEN 
+ * in size.  (Defined in cm_cell.h)
+ */
 long cm_GetRootCellName(char *cellNamep)
 {
     DWORD code, dummyLen;
@@ -405,7 +408,7 @@ long cm_GetRootCellName(char *cellNamep)
     if (code != ERROR_SUCCESS)
         return -1;
 
-    dummyLen = 256;
+    dummyLen = CELL_MAXNAMELEN;
     code = RegQueryValueEx(parmKey, "Cell", NULL, NULL,
 				cellNamep, &dummyLen);
     RegCloseKey (parmKey);