From: Kevin Wasserman <kevin.wasserman@painless-security.com>
Date: Thu, 28 Jun 2012 01:31:33 +0000 (-0400)
Subject: Change 'Get Ticket' to 'MIT Kerberos: Get Ticket'
X-Git-Tag: krb5-1.11-alpha1~261
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ae7790a9be2b7c5534362381f9cf932ae96ff29;p=thirdparty%2Fkrb5.git

Change 'Get Ticket' to 'MIT Kerberos: Get Ticket'

Also improve string copy safety.

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

ticket: 7284 (new)
queue: kfw
target_version: 1.10.4
tags: pullup
---

diff --git a/src/windows/leash/LeashView.cpp b/src/windows/leash/LeashView.cpp
index be4a8a51f2..298bee76cf 100644
--- a/src/windows/leash/LeashView.cpp
+++ b/src/windows/leash/LeashView.cpp
@@ -2786,18 +2786,18 @@ CLeashView::OnObtainTGTWithParam(WPARAM wParam, LPARAM lParam)
 
     if ( param ) {
         if ( *param )
-            strcpy(ldi.in.title,param);
+            strcpy_s(ldi.in.title,param);
         param += strlen(param) + 1;
         if ( *param )
-            strcpy(ldi.in.username,param);
+            strcpy_s(ldi.in.username,param);
         param += strlen(param) + 1;
         if ( *param )
-            strcpy(ldi.in.realm,param);
+            strcpy_s(ldi.in.realm,param);
         param += strlen(param) + 1;
 	if ( *param )
-	    strcpy(ldi.in.ccache,param);
+	    strcpy_s(ldi.in.ccache,param);
     } else {
-        strcpy(ldi.in.title,"Get Ticket");
+        strcpy_s(ldi.in.title, "MIT Kerberos: Get Ticket");
     }
 
     if (strlen(ldi.username) > 0 && strlen(ldi.realm) > 0)
diff --git a/src/windows/leashdll/lshfunc.c b/src/windows/leashdll/lshfunc.c
index 90fb4b3537..ca9f67e6e7 100644
--- a/src/windows/leashdll/lshfunc.c
+++ b/src/windows/leashdll/lshfunc.c
@@ -2721,9 +2721,9 @@ acquire_tkt_send_msg_leash(const char *title,
             strcpy_s(strs, bufsize, title);
         else if (name != NULL && realm != NULL)
             sprintf_s(strs, bufsize,
-                      "Obtain Kerberos TGT for %s@%s", name, realm);
+                      "MIT Kerberos: Get Ticket for %s@%s", name, realm);
         else
-            strcpy_s(strs, bufsize, "Obtain Kerberos TGT");
+            strcpy_s(strs, bufsize, "MIT Kerberos: Get Ticket");
         step = strlen(strs);
         strs += step + 1;
         bufsize -= step;