Merge branch 'master' of https://github.com/BOINC/boinc

Author: davidpanderson

client/acct_mgr.cpp

@@ -49,18 +49,6 @@
 
 static const char *run_mode_name[] = {"", "always", "auto", "never"};
 
-static void am_url_filename(char* url, char* filename) {
-    char buf [1024];
-    escape_project_url(url, buf);
-    sprintf(filename, "acct_mgr_url_%s.xml", buf);
-}
-
-static void am_login_filename(char* url, char* filename) {
-    char buf[1024];
-    escape_project_url(url, buf);
-    sprintf(filename, "acct_mgr_login_%s.xml", buf);
-}
-
 // do an account manager RPC;
 // if URL is null, detach from current account manager
 //
@@ -87,15 +75,8 @@ int ACCT_MGR_OP::do_rpc(
     if (!strlen(url) && strlen(gstate.acct_mgr_info.master_url)) {
         msg_printf(NULL, MSG_INFO, "Removing account manager info");
         gstate.acct_mgr_info.clear();
-
-        // don't delete the url and login files in case
-        // user later reattaches to same AM (use same opaque data)
-        //
-        // char filename[MAXPATHLEN];
-        // am_url_filename(master_url, filename);
-        // boinc_delete_file(filename);
-        // am_login_filename(master_url, filename);
-        // boinc_delete_file(filename);
+        boinc_delete_file(ACCT_MGR_URL_FILENAME);
+        boinc_delete_file(ACCT_MGR_LOGIN_FILENAME);
         error_num = 0;
         for (i=0; i<gstate.projects.size(); i++) {
             gstate.projects[i]->detach_ams();
@@ -111,22 +92,6 @@ int ACCT_MGR_OP::do_rpc(
         return 0;
     }
 
-    // if we're not currently attached to an AM,
-    // see if the AM login file is present for this URL,
-    // and parse it to get opaque data
-    //
-    if (!strlen(gstate.acct_mgr_info.master_url)) {
-        char filename[MAXPATHLEN];
-        am_login_filename(ami.master_url, filename);
-        FILE* f = fopen(filename, "r");
-        if (f) {
-            ACCT_MGR_INFO ami2;
-            ami2.parse_login_file(f);
-            fclose(f);
-            strcpy(gstate.acct_mgr_info.opaque, ami2.opaque);
-        }
-    }
-
     strlcpy(ami.master_url, url, sizeof(ami.master_url));
     strlcpy(ami.project_name, "", sizeof(ami.project_name));
     strlcpy(ami.login_name, name.c_str(), sizeof(ami.login_name));
@@ -772,11 +737,9 @@ void ACCT_MGR_OP::handle_reply(int http_op_retval) {
 }
 
 int ACCT_MGR_INFO::write_info() {
-    char filename[MAXPATHLEN];
     FILE* p;
     if (strlen(master_url)) {
-        am_url_filename(master_url, filename); 
-        p = fopen(filename, "w");
+        p = fopen(ACCT_MGR_URL_FILENAME, "w");
         if (p) {
             fprintf(p,
                 "<acct_mgr>\n"
@@ -800,8 +763,7 @@ int ACCT_MGR_INFO::write_info() {
     }
 
     if (strlen(login_name)) {
-        am_login_filename(master_url, filename); 
-        p = fopen(filename, "w");
+        p = fopen(ACCT_MGR_URL_FILENAME, "w");
         if (p) {
             fprintf(
                 p,
@@ -899,27 +861,17 @@ int ACCT_MGR_INFO::init() {
     MIOFILE mf;
     FILE*   p;
     int retval;
-    char filename[MAXPATHLEN];
 
     clear();
-    if (strlen(master_url) == 0) {
-        return 0;
-    }
-    am_url_filename(master_url, filename);
-    p = fopen(filename, "r");
+    p = fopen(ACCT_MGR_URL_FILENAME, "r");
     if (!p) {
-        // try old name
+        // if not using acct mgr, make sure projects not flagged,
+        // otherwise won't be able to detach them.
         //
-        p = fopen(ACCT_MGR_URL_FILENAME, "r");
-        if (!p) {
-            // if not using acct mgr, make sure projects not flagged,
-            // otherwise won't be able to detach them.
-            //
-            for (unsigned int i=0; i<gstate.projects.size(); i++) {
-                gstate.projects[i]->attached_via_acct_mgr = false;
-            }
-            return 0;
+        for (unsigned int i=0; i<gstate.projects.size(); i++) {
+            gstate.projects[i]->attached_via_acct_mgr = false;
         }
+        return 0;
     }
     mf.init_file(p);
     XML_PARSER xp(&mf);
@@ -956,12 +908,7 @@ int ACCT_MGR_INFO::init() {
     }
     fclose(p);
 
-    am_login_filename(master_url, filename);
-    p = fopen(filename, "r");
-    if (!p) {
-        // try old name
-        p = fopen(ACCT_MGR_LOGIN_FILENAME, "r");
-    }
+    p = fopen(ACCT_MGR_LOGIN_FILENAME, "r");
     if (p) {
         parse_login_file(p);
         fclose(p);