From 2ca027463182c54134d2f02c92559e0031a6d6b6 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Sun, 9 Jan 2005 23:55:35 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=5052
---
 checkin_notes                                 |   6 +++++-
 win_build/installerv2/BOINC.ism               | Bin 205312 -> 205312 bytes
 .../installerv2/redist/Windows/BOINC.vbs      |   8 +-------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index d45894a4d6..637ac32c20 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -22440,7 +22440,7 @@ David  9 Jan 2005
         forum.inc
         profile.inc
 
-David  9 Oct 2005
+David  9 Jan 2005
     - message board fixes - show thread titles using htmlspecialchars()
         prevent invisible titles
 
@@ -22450,3 +22450,7 @@ David  9 Oct 2005
             forum_show.inc
         user/
             forum_thread.php
+
+Rom    9 Jan 2005 (boinc)
+    - Tag for 4.58 release, all platforms
+      boinc_core_release_4_58
diff --git a/win_build/installerv2/BOINC.ism b/win_build/installerv2/BOINC.ism
index de7313114bad20e731e4ed7749ca3f21d7279e11..40fef8cdf49392c19bed7a938d2ec0036ddffec4 100644
GIT binary patch
delta 566
zcmX|-O=uHA7>0LdHa}z6Hl*6LNoj{IXu%Lon$}<y3Sz)s3`rFH31OQ|?ZUdz?e@ou
zRPZQ>33l<|We<DsAkxL1O9jDrDbk|gF;x^V9*T&#f(M;I@r8HbduI5)_nWo0wAPlM
zYhv*GSC({sxrX=-Vepr0KoA7$&SNm{n&F*b>ufOXntcT^9OnGU|GS_4(g7Eb_y|+I
zUT&25Y0Fs`U*g21WM0*1DsNvIY$-2dE-^kKTr6HFRx{bLv5n<T=)PH<9>S`=XeydU
z%#G&n9>jaQf1U(H7u$Yl|M|(uwEdKmXMO@toG<06VlEl>7AM=BD76Jj>WvlM{>I6k
zKWfcH0d{(U$Z!<+qgXL+6SG0)sFUfkDd6{GMJG2DUAa!ZSzr!>Hd~qpkFLQ$FOyya
zF}~gbq7~_YFdOcGB!FKIve{kWr5TPu9?LMOZsr?W-5G??`WS;lOpe1{gl{S}TIO*U
zoDn$Aa31<cv3`nN%~X<vI6CCx4agI|d<e1A?3U}$pTLyte}cCK`QW?n;c+W64MJ>Y
z8`>l>*HHCZHJh5uRaaD<uew-Ob(3nVxheK}4@$`U0q+M;LICW64{t@H7YpUfg>&Q#
zkxSHAR%=xD!l(jpw?*m%msP>2%-&*@>#^<~MyIV;Q6#p+=B77*4v8@=0HKdN#w~M8
M++6Hf9DNA=1IJaj1^@s6

delta 521
zcmXw#!D|yi7{zzKnI@TbZDUJJlSo`r(1IFGnzThPN=d*TRFcqxTEd!c%;GxH&DQ21
z(my~@671r^gE<5h5!t}br3b;%Ly<}k9_?9r=s}7r2-OMVgZCYNhmZH(>V~|!A%8H4
z@7Z1a`px&ANp^61&X?+0fiFIa0+J;C5wah@K$AUd<T?o)6X>MyKXfoA4^o{qEY&a+
z%ZYoqlgLnwEtTp;ah(MLZj4h)Q>wb5CG(EyVdvpG&`dHrlRPifTW?;BIIUkpm`bSk
z`{e+kg~GK$Ih~o9a5|p9^Y%ZO$)=q5UaYf4=+u>BUQ?}Q)7chak5IKz)0Cz93Ul_o
z6Ww7%=v*O}yIQ=wkaI_oKxssf+79MJ{Kz!g8*}H8bsTN-<tlo93l4$HpAd=Ce%HPZ
zdE^^9hhT7+&+j5PMOCKUQ<-{4bA#adyW;@FG&N@Lgdxr&QP{=ZI84&}YDFuFBsDh=
z-l;AFLfHl7W_t0AqPQlA9IZZTDD|ph)pU0ayeW4J5V2ovLYAN1hIa}-*asQgKg0Ma
zO1MAZ$p98}^QRs>2=dVYUPN}2;!^B(U1ybYf5-BQ&P4Y{S!b4JG-s#zXNqTs+NAYp
gErc)ek0D$lVev#7k&qM?P6*4wF$wY0QT)~a7xGuH#sB~S

diff --git a/win_build/installerv2/redist/Windows/BOINC.vbs b/win_build/installerv2/redist/Windows/BOINC.vbs
index 6d9013311c..f105ae23fe 100644
--- a/win_build/installerv2/redist/Windows/BOINC.vbs
+++ b/win_build/installerv2/redist/Windows/BOINC.vbs
@@ -248,13 +248,7 @@ Function PopulateServiceAccount()
         End If
     End If
         
-    If ( strUserDomain = Property("ComputerName") ) Then
-        strDomainUsername = ".\" & strUserName
-    Else
-        strDomainUsername = strUserDomain & "\" & strUserName
-    End If
-                      
-    Property("SERVICE_DOMAINUSERNAME") = strDomainUsername
+    Property("SERVICE_DOMAINUSERNAME") = strUserDomain & "\" & strUserName
 
     Set oNetwork = Nothing