From 64608800cb471a472823b7ba82c82cc4d0fc236e Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 9 Feb 2012 20:34:29 +0000
Subject: [PATCH] - scheduler: don't send "update GPU driver" messages if    
 the client didn't report a driver version #

svn path=/trunk/boinc/; revision=25232
---
 checkin_notes                 | 8 ++++++++
 doc/projects.inc              | 2 +-
 sched/file_upload_handler.cpp | 4 ++--
 sched/sched_customize.cpp     | 8 ++++++--
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index e9d5ee5a5d..1390a3ff01 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -1559,3 +1559,11 @@ David  9 Feb 2012
 
 	client/
 		cs_files.cpp
+
+David  9 Feb 2012
+    - scheduler: don't send "update GPU driver" messages if
+        the client didn't report a driver version #
+
+    sched/
+        sched_customize.cpp
+        file_upload_handler.cpp
diff --git a/doc/projects.inc b/doc/projects.inc
index 7c877ac68a..de9641686a 100644
--- a/doc/projects.inc
+++ b/doc/projects.inc
@@ -287,7 +287,7 @@ $math = array(
         array(
             "SAT@home",
             "http://sat.isa.ru/pdsat/",
-            "Institute for Systems Analysis, Russian Academy of Sciences",
+            "Institute for Systems Analysis and Institute for System Dynamics and Control Theory, Russian Academy of Science",
             "Computer Science",
             "Solve hard and practically important problems (discrete functions inversion problems, discrete optimization, bioinformatics, etc.) that can be effectively reduced to Boolean satisfiability problem.",
             "sat_logo.png"
diff --git a/sched/file_upload_handler.cpp b/sched/file_upload_handler.cpp
index 87a9e8bda7..1308ea14ec 100644
--- a/sched/file_upload_handler.cpp
+++ b/sched/file_upload_handler.cpp
@@ -304,12 +304,12 @@ int handle_file_upload(FILE* in, R_RSA_PUBLIC_KEY& key) {
             "<name>%s</name><max_nbytes>%.0f</max_nbytes>",
             name, max_nbytes
         );
-        retval = verify_string(
+        retval = check_string_signature(
             signed_xml, xml_signature, key, is_valid
         );
         if (retval || !is_valid) {
             log_messages.printf(MSG_CRITICAL,
-                "verify_string() [%s] [%s] retval %d, is_valid = %d\n",
+                "check_string_signature() [%s] [%s] retval %d, is_valid = %d\n",
                 signed_xml, xml_signature,
                 retval, is_valid
             );
diff --git a/sched/sched_customize.cpp b/sched/sched_customize.cpp
index 0b3bc5b6df..1db971674d 100644
--- a/sched/sched_customize.cpp
+++ b/sched/sched_customize.cpp
@@ -152,7 +152,9 @@ static bool ati_check(COPROC_ATI& c, HOST_USAGE& hu,
     double cpu_frac,    // fraction of FLOPS performed by CPU
     double flops_scale
 ) {
-    ati_requirements.update(min_driver_version, min_ram);
+    if (c.version_num) {
+        ati_requirements.update(min_driver_version, min_ram);
+    }
 
     if (need_amd_libs) {
         if (!c.amdrt_detected) {
@@ -276,7 +278,9 @@ static bool cuda_check(COPROC_NVIDIA& c, HOST_USAGE& hu,
     if (cc < min_cc) return false;
     if (max_cc && cc >= max_cc) return false;
 
-    cuda_requirements.update(min_driver_version, min_ram);
+    if (c.display_driver_version) {
+        cuda_requirements.update(min_driver_version, min_ram);
+    }
 
     // Old BOINC clients report display driver version;
     // newer ones report CUDA RT version.