[krbdev.mit.edu #5610] NIM password prompt does not identify itself

[Kevin Koch via RT]

The why? was why do it the wrong way.  The reason is that I don't have 
another day to spend on it right now.  As with the hack that fixed the 
UI update symptom in 3.2.1, this is obviously the wrong way to do it 
and needs to be redone correctly.

Tomorrow I'll post a different patch for krb5identpro.c that 
incorporates Asanka's comment.

After undoing Visual Studio's line wrapping and re-reading svn diff --
help, here is the last patch:

C:\KfW\pismere\athena\auth\krb5\src\windows\identity>svn diff -x --
ignore-eol-style ui\lang\en_us\khapp.rc
Index: ui/lang/en_us/khapp.rc
===================================================================
--- ui/lang/en_us/khapp.rc      (revision 19970)
+++ ui/lang/en_us/khapp.rc      (working copy)
@@ -160,34 +160,35 @@
 // Dialog
 //

-IDD_NC_NEWCRED DIALOGEX 0, 0, 301, 167
+IDD_NC_NEWCRED DIALOGEX 0, 0, 301, 165
 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    LTEXT           "UI Row2",IDC_NC_TPL_ROW_LG,7,31,287,18,NOT 
WS_VISIBLE | WS_BORDER
-    LTEXT           "TplPanel",IDC_NC_TPL_PANEL,7,7,287,153,NOT 
WS_VISIBLE | WS_BORDER
-    LTEXT           "UI Row",IDC_NC_TPL_ROW,7,7,287,18,NOT WS_VISIBLE 
| WS_BORDER
-    LTEXT           "TplLabel",IDC_NC_TPL_LABEL,7,8,45,10,NOT 
WS_VISIBLE | WS_BORDER
-    LTEXT           "TplInput",IDC_NC_TPL_INPUT,54,7,240,13,NOT 
WS_VISIBLE | WS_BORDER
-    LTEXT           "TplLabelLg",IDC_NC_TPL_LABEL_LG,7,33,146,10,NOT 
WS_VISIBLE | WS_BORDER
-    
LTEXT           "TplInputLg",IDC_NC_TPL_INPUT_LG,155,31,139,13,NOT 
WS_VISIBLE | WS_BORDER
-    
LTEXT           "&Credentials",IDC_NC_CREDTEXT_LABEL,7,66,41,10,NOT 
WS_VISIBLE | NOT WS_GROUP
-    CONTROL         "",IDC_NC_CREDTEXT,"KhmHtWnd",NOT WS_VISIBLE | 
WS_TABSTOP,54,65,240,95,WS_EX_CLIENTEDGE
-    PUSHBUTTON      "&Ok",IDOK,101,142,89,18,WS_DISABLED
-    PUSHBUTTON      "&Cancel",IDCANCEL,198,142,54,18
-    PUSHBUTTON      "&>>",IDC_NC_ADVANCED,260,142,34,18
+    LTEXT           "UI Row2",IDC_NC_TPL_ROW_LG,7,52,287,19,NOT 
WS_VISIBLE | WS_BORDER
+    LTEXT           "TplPanel",IDC_NC_TPL_PANEL,7,27,287,131,NOT 
WS_VISIBLE | WS_BORDER
+    LTEXT           "",IDC_NC_TPL_ROW,7,29,287,21,NOT WS_VISIBLE | 
WS_BORDER
+    LTEXT           "TplLabel",IDC_NC_TPL_LABEL,7,29,45,21,NOT 
WS_VISIBLE | WS_BORDER
+    LTEXT           "TplInput",IDC_NC_TPL_INPUT,54,31,240,13,NOT 
WS_VISIBLE | WS_BORDER
+    LTEXT           "TplLabelLg",IDC_NC_TPL_LABEL_LG,7,54,146,10,NOT 
WS_VISIBLE | WS_BORDER
+    
LTEXT           "TplInputLg",IDC_NC_TPL_INPUT_LG,155,52,139,13,NOT 
WS_VISIBLE | WS_BORDER
+    
LTEXT           "&Credentials",IDC_NC_CREDTEXT_LABEL,7,71,41,10,NOT 
WS_VISIBLE | NOT WS_GROUP
+    CONTROL         "",IDC_NC_CREDTEXT,"KhmHtWnd",NOT WS_VISIBLE | 
WS_TABSTOP,54,63,240,95,WS_EX_CLIENTEDGE
+    PUSHBUTTON      "&Ok",IDOK,101,140,89,18,WS_DISABLED
+    PUSHBUTTON      "&Cancel",IDCANCEL,198,140,54,18
+    PUSHBUTTON      "&>>",IDC_NC_ADVANCED,260,140,34,18
+    LTEXT           "Enter your Kerberos 
password",IDC_ENTUNAME,7,7,287,20
 END

-IDD_NC_BBAR DIALOGEX 0, 0, 66, 190
+IDD_NC_BBAR DIALOGEX 0, 0, 66, 215
 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "&Ok",IDOK,7,7,52,41,WS_DISABLED
-    PUSHBUTTON      "&Cancel",IDCANCEL,7,58,52,19
-    PUSHBUTTON      "<<",IDC_NC_BASIC,7,144,52,14
-    PUSHBUTTON      "&Help",IDC_NC_HELP,7,164,52,19
+    DEFPUSHBUTTON   "&Ok",IDOK,7,28,52,19,WS_DISABLED
+    PUSHBUTTON      "&Cancel",IDCANCEL,7,53,52,19
+    PUSHBUTTON      "&<<",IDC_NC_BASIC,7,163,52,19
+    PUSHBUTTON      "&Help",IDC_NC_HELP,7,189,52,19
 END

 IDD_PP_IDENT DIALOGEX 0, 0, 235, 156
@@ -232,7 +233,8 @@
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    CTEXT           "Please select one of the configuration 
categories on the 
left.",IDC_STATIC,21,17,212,18,SS_CENTERIMAGE,WS_EX_TRANSPARENT
+    CTEXT           "Please select one of the configuration 
categories on the left.",
+                    
IDC_STATIC,21,17,212,18,SS_CENTERIMAGE,WS_EX_TRANSPARENT
 END

 IDD_CFG_GENERAL DIALOGEX 0, 0, 255, 182
@@ -415,7 +417,7 @@
         LEFTMARGIN, 7
         RIGHTMARGIN, 294
         TOPMARGIN, 7
-        BOTTOMMARGIN, 160
+        BOTTOMMARGIN, 158
     END

     IDD_NC_BBAR, DIALOG
@@ -423,7 +425,7 @@
         LEFTMARGIN, 7
         RIGHTMARGIN, 59
         TOPMARGIN, 7
-        BOTTOMMARGIN, 183
+        BOTTOMMARGIN, 208
     END

     IDD_PP_IDENT, DIALOG
@@ -849,10 +851,5 @@
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-
-
-
///////////////////////////////////////////////////////////////////////
//////
+ /////////////////////////////////////////////////////////////////////
////////
 #endif    // not APSTUDIO_INVOKED
-
-
-