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

diff --git a/src/windows/build/BKWconfig.xml b/src/windows/build/BKWconfig.xml
index 31294ea66994f7ebbc7f8e05f6f30ca98315efab..654396685429239c74e57e42972ab9a823b4ff09 100644 (file)
--- a/src/windows/build/BKWconfig.xml
+++ b/src/windows/build/BKWconfig.xml
@@ -41,7 +41,7 @@
         <svnbranch  def="0" value="" />\r
         <CVSROOT    def="A" value=":kserver:cvs.mit.edu:/cvs/pismere" />\r
         <SVNURL     def="A" value="svn.mit.edu" />   <!-- NB:  No protocol or slashes!! -->\r
-        <USERNAME   def="0" value="" />  <!-- Needed for svn/plink.  Override from command line -->\r
+        <username   def="0" value="" />  <!-- Needed for svn/plink.  Override from command line -->\r
 \r
         <!-- Environment variables: -->>\r
         <KH_RELEASE def="1" env="1" value="OFFICIAL" options="OFFICIAL PRERELEASE PRIVATE" />\r

diff --git a/src/windows/build/bkw-automation.html b/src/windows/build/bkw-automation.html
index d463df3a6bd389fc3e2b4bf68b7e30e2b9b0ae71..c6ebd1e2828600c0b067dfc55ba6599ca3d0188a 100644 (file)
--- 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>\r
                     <TR>\r
                         <TD width="23"></TD>\r
-                        <TD colSpan="3"><FONT face="courier">&lt;CommandLine&gt;</FONT></TD>\r
+                        <TD colSpan="3"><FONT face="courier">&lt;Config&gt;</FONT></TD>\r
                     </TR>\r
                     <TR>\r
                         <TD width="23"></TD>\r
                         <TD width="20"></TD>\r
-                        <TD colSpan="2"><FONT face="courier">&lt;Directories&gt;</FONT></TD>\r
-                    </TR>\r
-                    <TR>\r
-                        <TD width="23"></TD>\r
-                        <TD width="20"></TD>\r
-                        <TD width="22"></TD>\r
-                        <TD><FONT face="courier">&lt;src path ="<FONT color="#000099">C:\bkw"</FONT> /&gt;</FONT>\r
+                        <TD><FONT face="courier">&lt;src&nbsp;value ="<FONT color="#000099">C:\bkw"</FONT> /&gt;</FONT>\r
                         </TD>\r
                     </TR>\r
                 </TABLE>\r

diff --git a/src/windows/build/bkw.pl b/src/windows/build/bkw.pl
index ea7c192ac942b8d049845a5d9223a5c2583fd4dd..ac8259af9b23c6e93736e2eca52ab61a71180d89 100644 (file)
--- a/src/windows/build/bkw.pl
+++ b/src/windows/build/bkw.pl
@@ -270,8 +270,8 @@ sub main {
 \r
     if (! ($rverb =~ /skip/)) {\r
         local $len = 0;\r
-        if (exists $odr->{USERNAME}->{value}) {\r
-            $len = length $odr->{USERNAME}->{value};\r
+        if (exists $odr->{username}->{value}) {\r
+            $len = length $odr->{username}->{value};\r
             }\r
         if ($len < 1) {\r
             die "Fatal -- you won't get far accessing the repository without specifying a username.";\r