From: Ben Kaduk <kaduk@mit.edu>
Date: Mon, 22 Jun 2015 23:11:28 +0000 (-0400)
Subject: Put focus on password field when principal is set
X-Git-Tag: krb5-1.14-alpha1~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50b3bba748084c99a339bd526ad47ecfccc09472;p=thirdparty%2Fkrb5.git

Put focus on password field when principal is set

In the Leash "Get Ticket" window, under some user-customized
configurations, the principal field can be pre-populated.  In this case,
it makes sense for the default focus to be on the password field,
since most users will only be using a single principal and should
go directly to typing their password.

The focus was already set to the password field in the case when
the principal was not modifiable (such as when the "Get Ticket" dialog
was opened by an application requesting a specific ticket).

ticket: 8032
tags: pullup
target_version: 1.13.3
---

diff --git a/src/windows/leashdll/lsh_pwd.c b/src/windows/leashdll/lsh_pwd.c
index 3c965b4ece..ac85625a0b 100644
--- a/src/windows/leashdll/lsh_pwd.c
+++ b/src/windows/leashdll/lsh_pwd.c
@@ -1506,7 +1506,7 @@ AuthenticateProc(
         SetActiveWindow(hDialog);
         SetForegroundWindow(hDialog);
         /* put focus on password if princ is read-only */
-        hFocusCtrl = bReadOnlyPrinc ?
+        hFocusCtrl = (bReadOnlyPrinc || principal[0] != '\0') ?
             GetDlgItem(hDialog, IDC_EDIT_PASSWORD) : hEditCtrl;
         if (((HWND)wParam) != hFocusCtrl) {
             SetFocus(hFocusCtrl);