Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
JAliEn
JAliEn-ROOT
Commits
c01c6803
Commit
c01c6803
authored
Oct 18, 2019
by
Volodymyr Yurchenko
Browse files
jclient file will not contain any usercert value, remove jcf read attempt from TJAlienCredentials
parent
6e98773e
Changes
3
Hide whitespace changes
Inline
Side-by-side
inc/TJAlien.h
View file @
c01c6803
...
...
@@ -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"
...
...
inc/TJAlienCredentials.h
View file @
c01c6803
...
...
@@ -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
src/TJAlienCredentials.cxx
View file @
c01c6803
...
...
@@ -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
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment