Commit c01c6803 authored by Volodymyr Yurchenko's avatar Volodymyr Yurchenko
Browse files

jclient file will not contain any usercert value, remove jcf read attempt from TJAlienCredentials

parent 6e98773e
......@@ -41,7 +41,6 @@
#include <TLockFile.h>
#include "TObjArray.h"
#include "TString.h"
#include "TJClientFile.h"
#include "TJAlienJDL.h"
#include "TJAlienCollection.h"
#include "TJAlienFile.h"
......
......@@ -5,7 +5,6 @@
#include <map>
#include <termios.h>
#include "TObject.h"
#include "TJClientFile.h"
using std::string;
using std::map;
......@@ -91,8 +90,6 @@ private:
string homedir;
map<CredentialsKind, TJAlienCredentialsObject> found_credentials;
TJClientFile jcf;
ClassDef(TJAlienCredentials, 0)
};
#endif
......@@ -65,14 +65,14 @@ string TJAlienCredentials::getTokenkeyPath()
string TJAlienCredentials::getUsercertPath()
{
std::string usercert = jcf.sUsercert.Data()[0] != '\0' ? jcf.sUsercert.Data() : homedir + "/.globus/usercert.pem";
std::string usercert = homedir + "/.globus/usercert.pem";
std::string usercertpath = std::getenv("X509_USER_CERT") ? : usercert;
return usercertpath;
}
string TJAlienCredentials::getUserkeyPath()
{
std::string userkey = jcf.sUserkey.Data()[0] != '\0' ? jcf.sUserkey.Data() : homedir + "/.globus/userkey.pem";
std::string userkey = homedir + "/.globus/userkey.pem";
std::string userkeypath = std::getenv("X509_USER_KEY") ? : userkey;
return userkeypath;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment