From 534616f9d41f04a77ee9e36972f5deacde81ff45 Mon Sep 17 00:00:00 2001
From: Tom Yu <tlyu@mit.edu>
Date: Wed, 18 Apr 2007 22:15:20 +0000
Subject: [PATCH] pull up r19431 from trunk

 r19431@cathode-dark-space:  kpkoch | 2007-04-12 11:48:12 -0400
 Make case of username in config.xml and presence test match what's passed to GETOPTS!

 Update doc for new config structure in config xml.

ticket: 5521

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19495 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/windows/build/BKWconfig.xml       |  2 +-
 src/windows/build/bkw-automation.html | 10 ++--------
 src/windows/build/bkw.pl              |  4 ++--
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/windows/build/BKWconfig.xml b/src/windows/build/BKWconfig.xml
index 31294ea66..654396685 100644
--- a/src/windows/build/BKWconfig.xml
+++ b/src/windows/build/BKWconfig.xml
@@ -41,7 +41,7 @@
         <svnbranch  def="0" value="" />
         <CVSROOT    def="A" value=":kserver:cvs.mit.edu:/cvs/pismere" />
         <SVNURL     def="A" value="svn.mit.edu" />   <!-- NB:  No protocol or slashes!! -->
-        <USERNAME   def="0" value="" />  <!-- Needed for svn/plink.  Override from command line -->
+        <username   def="0" value="" />  <!-- Needed for svn/plink.  Override from command line -->
 
         <!-- Environment variables: -->>
         <KH_RELEASE def="1" env="1" value="OFFICIAL" options="OFFICIAL PRERELEASE PRIVATE" />
diff --git a/src/windows/build/bkw-automation.html b/src/windows/build/bkw-automation.html
index d463df3a6..c6ebd1e28 100644
--- a/src/windows/build/bkw-automation.html
+++ b/src/windows/build/bkw-automation.html
@@ -306,18 +306,12 @@ Default is bkw.pl.log. <BR>&nbsp;
                     </TR>
                     <TR>
                         <TD width="23"></TD>
-                        <TD colSpan="3"><FONT face="courier">&lt;CommandLine&gt;</FONT></TD>
+                        <TD colSpan="3"><FONT face="courier">&lt;Config&gt;</FONT></TD>
                     </TR>
                     <TR>
                         <TD width="23"></TD>
                         <TD width="20"></TD>
-                        <TD colSpan="2"><FONT face="courier">&lt;Directories&gt;</FONT></TD>
-                    </TR>
-                    <TR>
-                        <TD width="23"></TD>
-                        <TD width="20"></TD>
-                        <TD width="22"></TD>
-                        <TD><FONT face="courier">&lt;src path ="<FONT color="#000099">C:\bkw"</FONT> /&gt;</FONT>
+                        <TD><FONT face="courier">&lt;src&nbsp;value ="<FONT color="#000099">C:\bkw"</FONT> /&gt;</FONT>
                         </TD>
                     </TR>
                 </TABLE>
diff --git a/src/windows/build/bkw.pl b/src/windows/build/bkw.pl
index ea7c192ac..ac8259af9 100644
--- a/src/windows/build/bkw.pl
+++ b/src/windows/build/bkw.pl
@@ -270,8 +270,8 @@ sub main {
 
     if (! ($rverb =~ /skip/)) {
         local $len = 0;
-        if (exists $odr->{USERNAME}->{value}) {
-            $len = length $odr->{USERNAME}->{value};
+        if (exists $odr->{username}->{value}) {
+            $len = length $odr->{username}->{value};
             }
         if ($len < 1) {
             die "Fatal -- you won't get far accessing the repository without specifying a username.";
-- 
2.26.2