From a3d41f2f11eff714007d7ab0f4699fed0fcee8cf Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Sat, 5 Feb 2005 22:18:41 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=5331
---
 checkin_notes                                 |  12 ++++++++++++
 win_build/installerv2/BOINC.ism               | Bin 205312 -> 205312 bytes
 .../installerv2/redist/Windows/BOINC.vbs      |   2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/checkin_notes b/checkin_notes
index 1b619d393b..de4f2788ee 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -24034,3 +24034,15 @@ Rom    5 Feb 2005
 Rom    5 Feb 2005
     - Tag for 4.66 release, all platforms
       boinc_core_release_4_66
+
+Rom    5 Feb 2005
+    - Bug Fix: Remove the Users group from the service install type ACL list.
+    - Bug Fix: Set ALLUSERS to null when either the Single or Service install
+        type is selected
+    - Bug Fix: Adjust the validate setup type script to account for the new
+        rules
+
+    win_build/installerv2/
+        BOINC.ism
+    win_build/installerv2/redist/windows
+        BOINC.vbs
diff --git a/win_build/installerv2/BOINC.ism b/win_build/installerv2/BOINC.ism
index ee4da096e23db74958fba4e1c3c2e1862fa56b57..bc754e74957fd6a55edec19dc054f43ba3fc578c 100644
GIT binary patch
delta 540
zcmXw!O=uHg5QZ}|Tk_NFX5GYUL$poQ=CC=a1<``I!9<Py5slS@l^``jF>NswTcMB?
z5kXMWM)G+OJqYVfgoXVM9?T&{@DQZ9^isi#f>??_2U}3rO`!u1%=^v@GgEH(%MJgl
zg3wm6&yO^X8^S#a)~g#z31*Gk!6SD84dd}N0T}9&euO}E`sp`t8>7$q3oPQHsPAYj
zn=jrP8_mb~%XWyPDZwKm)dh@ggE3}_pqdI;UHU-~n03HWhrkM&r{VqsA%UOW{NXZO
zYxDlIZM%id|E>V_GArXGWwhM-PDFQZU~=+$W};fY66X}gB{FwotOt<qN#RF;tIU3l
z9c*<MhRhRa#q|kvc8#N2P3@JrT*SpLeW7K|qiWXB>eb&lYG4UdY`hQLyt|1nB;`^z
zeeOc$cse)iG(*Y3^kx2b1@|kSEua5c!v>l^aRf+l0nh!yr~opb`;8@;)qkL7dZ-Sj
zkDA2Zixg(7BKf3GVxQ#NEcEnvSlvsSDLJ{COzSYiH)J}A-ow-yUKAtjY><Kx8v@@q
zvF*|uz;cT%kIe+>)Ivq8iIiZ85QUy=6=2$Ss<XK@46zRZO8B$c{LN&cFg%qnPVs05
seZls9t-n%d29uc~wxg4d@!3uifSk+NoiOD=<X^+IOoleEf!<B{9|yU%F8}}l

delta 622
zcmX|+Ur1AN6vyv5=MJy3-LBi*at&vRi?~wJKupXw+*T@1O6(;=XkKHmjAo`muth}?
z6w4d;*F*oF20=tL*zY0A5qmMpr-lzD)MEq{^-zMj?k()$ob%<w_sij%tJrfD`;)Y2
z+buNCPZUp!S7cbzSDjgyES_`iy$nz+-kv4EqIzc#LD6ULeFmwRyg!&`58~iw`7w0r
z(qpe)o~h&Qc6bMd6V#Fnw}=EmV5|{RTy;V<V0407*aIS0JE7__6jVzCaP7L-DqpSV
zH<n@2R=;2-)@!xeI{*D1D8y9-t96DC)xu^(n$R-rkQco?=EG;i@(J`ZZyepF7TgvD
z;%!k}0j|cey4}c_nJE<YH@gCSAcLiVVVGnd&F=<QLu_~v9n7(WErnMovX5`k!}5!0
z<MAbYB-@XlN=+qCp2+Of<}?=ZQX3DgAUJL9qa(4yyyq)c(2yux`i^5@wdCVJaH|Lo
ze&Hu(6&{wT42EnP8fb~wYX|u~cP*c=L$bCYd~o#2*5zT@w6Ygp(9PT)>M#`g1(*1$
zLI<!*5KszAUDQC<^~>GzKUITG-!|r<fVmC50H&_hvTV*p2StnO(R>f<tD_Fq;U>4?
zAW;|dYb@MEW&6m8b|#Wek4|fuY4&mp_3{}HJx9fCc%;8CHf~i-M22E)Uo-6w9^Jsv
s;h{)>;#jvCJDW;s|M_1#Ki^CuP?G@cqK`Ci@=rcmrl&W<P-rFm17#Dzpa1{>

diff --git a/win_build/installerv2/redist/Windows/BOINC.vbs b/win_build/installerv2/redist/Windows/BOINC.vbs
index 448302576e..135d9dca29 100644
--- a/win_build/installerv2/redist/Windows/BOINC.vbs
+++ b/win_build/installerv2/redist/Windows/BOINC.vbs
@@ -268,7 +268,7 @@ Function ValidateSetupType()
 
     strSetupType = Property("SETUPTYPE")
     If (Len(strSetupType) <> 0) Then
-        If ( strSetupType = "Single" ) Then
+        If ( strSetupType = "Single" Or strSetupType = "Service" ) Then
             If (Property("ALLUSERS") <> "") Then
 			    oRecord.IntegerData(1) = 25002
 			    Message msiMessageTypeFatalExit, oRecord