krb5 commit: Rename "Leash" to "MIT Kerberos"
Benjamin Kaduk
kaduk at MIT.EDU
Tue Aug 28 16:30:19 EDT 2012
https://github.com/krb5/krb5/commit/e2b8ec99dd4a898d29eab8f5ed19f03b238fef0f
commit e2b8ec99dd4a898d29eab8f5ed19f03b238fef0f
Author: Kevin Wasserman <kevin.wasserman at painless-security.com>
Date: Fri Jun 29 13:07:48 2012 -0400
Rename "Leash" to "MIT Kerberos"
In the executable name and many GUI elements.
Signed-off-by: Kevin Wasserman <kevin.wasserman at painless-security.com>
ticket: 7292 (new)
queue: kfw
target_version: 1.10.4
tags: pullup
src/windows/installer/wix/files.wxi | 6 +++---
src/windows/leash/Leash.cpp | 6 +++---
src/windows/leash/Leash.rc | 6 +++---
src/windows/leash/LeashAboutBox.cpp | 2 +-
src/windows/leash/LeashView.cpp | 14 +++++++-------
src/windows/leash/Makefile.in | 1 +
src/windows/version.rc | 4 ++--
7 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi
index 0d75b98..63339ba 100644
--- a/src/windows/installer/wix/files.wxi
+++ b/src/windows/installer/wix/files.wxi
@@ -152,9 +152,9 @@
<Registry Id="reg_ts_krbcc32s_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\ccapiserver" Name="Flags" Type="integer" Value="1032" />
</Component>
<Component Win64="$(var.Win64)" Id="cmf_leash_exe" Guid="$(var.cmf_leash_exe_guid)" DiskId="1">
- <File Id="fil_leash_exe" Name="leash.exe" KeyPath="yes">
- <Shortcut Id="sc_leash_exe" Advertise="yes" Directory="dirShortcut" Name="Leash Kerberos Ticket Manager.lnk" Arguments="[LEASHAUTOINIT]" />
- <Shortcut Id="sc_leash_desktop_exe" Advertise="yes" Directory="DesktopFolder" Name="Leash Kerberos Ticket Manager.lnk" Arguments="[LEASHAUTOINIT]" />
+ <File Id="fil_leash_exe" Name="MIT Kerberos.exe" KeyPath="yes">
+ <Shortcut Id="sc_leash_exe" Advertise="yes" Directory="dirShortcut" Name="MIT Kerberos Ticket Manager.lnk" Arguments="[LEASHAUTOINIT]" />
+ <Shortcut Id="sc_leash_desktop_exe" Advertise="yes" Directory="DesktopFolder" Name="MIT Kerberos Ticket Manager.lnk" Arguments="[LEASHAUTOINIT]" />
</File>
<Registry Id="reg_ts_leash32_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\leash32" Action="createKeyAndRemoveKeyOnUninstall" />
<Registry Id="reg_ts_leash32_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\leash32" Name="Flags" Type="integer" Value="1032" />
diff --git a/src/windows/leash/Leash.cpp b/src/windows/leash/Leash.cpp
index 00cbde7..fe2e7e7 100644
--- a/src/windows/leash/Leash.cpp
+++ b/src/windows/leash/Leash.cpp
@@ -324,7 +324,7 @@ BOOL CLeashApp::InitInstance()
"'-autoinit' or '-a' to perform automatic ticket initialization\n"
"'-console' or '-c' to attach a console for debugging\n"
"'-ms2mit' or '-import' or '-m' to perform ticket importation (and exit)",
- "Leash Error", MB_OK);
+ "MIT Kerberos Error", MB_OK);
return FALSE;
}
}
@@ -336,7 +336,7 @@ BOOL CLeashApp::InitInstance()
"'-destroy' or '-d' to perform ticket destruction (and exit)\n"
"'-autoinit' or '-a' to perform automatic ticket initialization\n"
"'-ms2mit' or '-import' or '-m' to perform ticket importation (and exit)",
- "Leash Error", MB_OK);
+ "MIT Kerberos Error", MB_OK);
return FALSE;
}
}
@@ -479,7 +479,7 @@ BOOL CLeashApp::InitInstance()
VScheckVersion(m_pMainWnd->m_hWnd, AfxGetInstanceHandle());
// The one and only window has been initialized, so show and update it.
- m_pMainWnd->SetWindowText("Leash");
+ m_pMainWnd->SetWindowText("MIT Kerberos");
m_pMainWnd->UpdateWindow();
m_pMainWnd->ShowWindow(SW_SHOW);
m_pMainWnd->SetForegroundWindow();
diff --git a/src/windows/leash/Leash.rc b/src/windows/leash/Leash.rc
index accdd7e..9d01945 100644
--- a/src/windows/leash/Leash.rc
+++ b/src/windows/leash/Leash.rc
@@ -205,10 +205,10 @@ BEGIN
LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,0,43,347,88
END
-IDD_LEASH_ABOUTBOX DIALOG 0, 0, 310, 146
+IDD_LEASH_ABOUTBOX DIALOGEX 0, 0, 310, 146
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "About Leash"
-FONT 8, "MS Sans Serif"
+CAPTION "About MIT Kerberos"
+FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
CONTROL "Leash Modules",IDC_LEASH_MODULES,"Button",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,10,127,64,10
diff --git a/src/windows/leash/LeashAboutBox.cpp b/src/windows/leash/LeashAboutBox.cpp
index d8e3fde..632dc59 100644
--- a/src/windows/leash/LeashAboutBox.cpp
+++ b/src/windows/leash/LeashAboutBox.cpp
@@ -222,7 +222,7 @@ CLeashAboutBox::SetVersionInfo(
goto cleanup;
}
TCHAR version[100];
- _sntprintf(version, sizeof(version), TEXT("Leash Version %s"), szVersion);
+ _sntprintf(version, sizeof(version), TEXT("MIT Kerberos Version %s"), szVersion);
version[sizeof(version) - 1] = 0;
GetDlgItem(id_version)->SetWindowText(version);
diff --git a/src/windows/leash/LeashView.cpp b/src/windows/leash/LeashView.cpp
index 34b6b7d..043ed5f 100644
--- a/src/windows/leash/LeashView.cpp
+++ b/src/windows/leash/LeashView.cpp
@@ -2039,9 +2039,9 @@ LRESULT CLeashView::OnTrayIcon(WPARAM wParam, LPARAM lParam)
CMenu * menu = new CMenu();
menu->CreatePopupMenu();
if ( !CMainFrame::m_isMinimum )
- menu->AppendMenu(MF_STRING, ID_LEASH_MINIMIZE, "&Close Leash Window");
+ menu->AppendMenu(MF_STRING, ID_LEASH_MINIMIZE, "&Close MIT Kerberos Window");
else
- menu->AppendMenu(MF_STRING, ID_LEASH_RESTORE, "&Open Leash Window");
+ menu->AppendMenu(MF_STRING, ID_LEASH_RESTORE, "&Open MIT Kerberos Window");
menu->AppendMenu(MF_SEPARATOR);
menu->AppendMenu(MF_STRING, ID_INIT_TICKET, "&Get Tickets");
if (WaitForSingleObject( ticketinfo.lockObj, INFINITE ) != WAIT_OBJECT_0)
@@ -2581,20 +2581,20 @@ BOOL CLeashView::PreTranslateMessage(MSG* pMsg)
if (CMainFrame::m_isMinimum)
{
if ( CLeashApp::m_hAfsDLL )
- strTimeDate = ( "Leash - "
+ strTimeDate = ( "MIT Kerberos - "
"[" + ticketStatusKrb5 + "] - " +
"[" + ticketStatusAfs + "] - " +
"[" + ticketinfo.Krb5.principal + "]" + " - " +
tTimeDate.Format("%A, %B %d, %Y %H:%M "));
else
- strTimeDate = ( "Leash - "
+ strTimeDate = ( "MIT Kerberos - "
"[" + ticketStatusKrb5 + "] - " +
"[" + ticketinfo.Krb5.principal + "]" + " - " +
tTimeDate.Format("%A, %B %d, %Y %H:%M "));
}
else
{
- strTimeDate = ("Leash - " +
+ strTimeDate = ("MIT Kerberos - " +
tTimeDate.Format("%A, %B %d, %Y %H:%M ")
//timeDate.Format("%d %b %y %H:%M:%S - ")
);
@@ -2603,11 +2603,11 @@ BOOL CLeashView::PreTranslateMessage(MSG* pMsg)
if (CLeashApp::m_hKrb5DLL) {
if ( ticketinfo.Krb5.btickets )
- strTimeDate = ( "Leash: "
+ strTimeDate = ( "MIT Kerberos: "
"[" + ticketStatusKrb5 + "]" +
" - [" + ticketinfo.Krb5.principal + "]");
else
- strTimeDate = "Leash: Kerb-5 No Tickets";
+ strTimeDate = "MIT Kerberos: No Tickets";
}
ReleaseMutex(ticketinfo.lockObj);
diff --git a/src/windows/leash/Makefile.in b/src/windows/leash/Makefile.in
index 99bdc76..4f6e583 100644
--- a/src/windows/leash/Makefile.in
+++ b/src/windows/leash/Makefile.in
@@ -90,6 +90,7 @@ $(OUTPRE)$(EXE_NAME).exe: $(OBJS) $(XOBJS) $(LIBS)
$(LINK) $(LFLAGS) /out:$@ /ENTRY:WinMainCRTStartup $(OBJS) $(XOBJS) \
$(LIBS) $(SYSLIBS) $(BUILDTOP)\util\wshelper\$(OUTPRE)$(WSHELPER).lib \
../lib/$(OUTPRE)libwin.lib atl.lib $(MFCLIB) $(SCLIB)
+ copy $@ "$(OUTPRE)MIT Kerberos.exe"
$(RESFILE): Leash.rc res/Leash.rc2 ver.rc ../version.rc ../kerberos.ver
diff --git a/src/windows/version.rc b/src/windows/version.rc
index a5c6927..b23eec1 100644
--- a/src/windows/version.rc
+++ b/src/windows/version.rc
@@ -109,10 +109,10 @@
#endif /* GSSAPI */
#ifdef LEASH_APP
-#define K5_DESCRIPTION "Leash32 Kerberos Ticket Manager - " KRB5_PRODUCTNAME_STR "\0"
+#define K5_DESCRIPTION "MIT Kerberos Ticket Manager - " KRB5_PRODUCTNAME_STR "\0"
#define K5_FILETYPE VFT_APP
#define K5_INTERNAL_NAME "LEASH\0"
-#define K5_ORIGINAL_NAME "leash.exe\0"
+#define K5_ORIGINAL_NAME "MIT Kerberos.exe\0"
#endif
#ifdef LEASHDLL_LIB
More information about the cvs-krb5
mailing list