From: Kevin Wasserman <kevin.wasserman@painless-security.com>
Date: Sun, 1 Jul 2012 02:42:12 +0000 (-0400)
Subject: KfW rename lacFoo -> Leash_pec_
X-Git-Tag: kfw-4.0-final~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee8c1ae3ce83e35b4ea6b0896d4055eca8144643;p=thirdparty%2Fkrb5.git

KfW rename lacFoo -> Leash_pec_

Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>

(cherry picked from commit e2b8cf10d536eeb1616f5b5e40fd41c691f24e29)

ticket: 7294
status: resolved
---

diff --git a/src/windows/leashdll/lsh_pwd.c b/src/windows/leashdll/lsh_pwd.c
index f023cf98d5..2afcc957ab 100644
--- a/src/windows/leashdll/lsh_pwd.c
+++ b/src/windows/leashdll/lsh_pwd.c
@@ -1306,9 +1306,9 @@ AdjustOptions(HWND hDialog, int show, int hideDiff)
 
 }
 
-extern void *lacInit(HWND hEditCtl);
-extern void lacTerm(void *pAutoComplete);
-extern void lacAddPrincipal(char *principal);
+extern void *Leash_pec_create(HWND hEditCtl);
+extern void Leash_pec_destroy(void *pAutoComplete);
+extern void Leasch_pec_add_principal(char *principal);
 extern void Leash_pec_clear_history(void *pec);
 
 /* Callback function for the Authentication Dialog box that initializes and
@@ -1352,7 +1352,7 @@ AuthenticateProc(
 
         hEditCtrl = GetDlgItem(hDialog, IDC_EDIT_PRINCIPAL);
         if (hEditCtrl)
-            pAutoComplete = lacInit(hEditCtrl);
+            pAutoComplete = Leash_pec_create(hEditCtrl);
 	hSliderLifetime = GetDlgItem(hDialog, IDC_STATIC_LIFETIME_VALUE);
 	hSliderRenew = GetDlgItem(hDialog, IDC_STATIC_RENEW_TILL_VALUE);
 
@@ -1593,7 +1593,7 @@ AuthenticateProc(
 		memset(password,0,sizeof(password));
 		RemoveProp(hDialog, "HANDLES_HELP");
         if (pAutoComplete) {
-            lacTerm(pAutoComplete);
+            Leash_pec_destroy(pAutoComplete);
             pAutoComplete = NULL;
         }
 		EndDialog(hDialog, (int)lParam);
@@ -1718,7 +1718,7 @@ AuthenticateProc(
                     lpdi->out.realm[LEASH_REALM_SZ-1] = 0;
                 }
 */
-                lacAddPrincipal(principal);
+                Leash_pec_add_principal(principal);
 
                 CloseMe(TRUE); /* success */
                 return FALSE;
diff --git a/src/windows/leashdll/lshutil.cpp b/src/windows/leashdll/lshutil.cpp
index 93383fa799..32dab585b5 100644
--- a/src/windows/leashdll/lshutil.cpp
+++ b/src/windows/leashdll/lshutil.cpp
@@ -564,7 +564,7 @@ protected:
 
 
 
-extern "C" void lacAddPrincipal(char *principal)
+extern "C" void Leash_pec_add_principal(char *principal)
 {
     // write princ to registry
     HKEY hKey;
@@ -593,15 +593,15 @@ extern "C" void Leash_pec_clear_history(void *pec)
 }
 
 
-extern "C" void *lacInit(HWND hEdit)
+extern "C" void *Leash_pec_create(HWND hEdit)
 {
     return new PrincipalEditControl(
         hEdit,
         Leash_get_default_uppercaserealm() ? true : false);
 }
 
-extern "C" void lacTerm(void *pHook)
+extern "C" void Leash_pec_destroy(void *pec)
 {
-    if (pHook != NULL)
-        delete ((PrincipalEditControl *)pHook);
+    if (pec != NULL)
+        delete ((PrincipalEditControl *)pec);
 }