Blob Blame History Raw

http://lists.globus.org/pipermail/myproxy-commit/2011-August/000619.html

Update of /cvsroot/cilogon/myproxy
In directory vz-cvs-4.sog:/tmp/cvs-serv30047

Modified Files:
	myproxy_creds.c 
Log Message:
fix failure handling for myproxy_creds_retrieve() calls in
myproxy_creds_retrieve_all_ex():
1) when trying to load default credential, it's not an error if we
   don't find one - this is a fix to my last commit
2) when scanning directory, if we fail to load a credential that
   should be there, don't rely on creds structure that may be cleared,
   but instead use stashed values when logging error


Index: myproxy_creds.c
===================================================================
RCS file: /cvsroot/cilogon/myproxy/myproxy_creds.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** myproxy_creds.c	30 Aug 2011 23:15:17 -0000	1.113
--- myproxy_creds.c	31 Aug 2011 18:25:32 -0000	1.114
***************
*** 1158,1165 ****
              }
          } else {
!             verror_put_string("failed to retrieve credentials for "
!                               "username \"%s\"", new_cred->username);
!             myproxy_log_verror(); /* internal error; should not happen */
!             verror_clear();
          }
      }
--- 1158,1162 ----
              }
          } else {
!             verror_clear();     /* OK if we don't find creds w/o credname */
          }
      }
***************
*** 1215,1220 ****
                  verror_put_string("failed to retrieve credentials for "
                                    "username \"%s\", credname \"%s\"",
!                                   new_cred->username,
!                                   new_cred->credname ? new_cred->credname : "");
                  myproxy_log_verror(); /* internal error; should not happen */
                  verror_clear();
--- 1212,1216 ----
                  verror_put_string("failed to retrieve credentials for "
                                    "username \"%s\", credname \"%s\"",
!                                   de->d_name, cname ? cname : "");
                  myproxy_log_verror(); /* internal error; should not happen */
                  verror_clear();