From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Thu, 10 Feb 2005 17:06:02 +0000 (+0000)
Subject: look also at X509_USER_{KEY,CERT} variables
X-Git-Tag: gridsite-core_R_1_1_5~22
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=9e17e91463b9fd6503c69d6c0fe6f58e40c85943;p=jra1mw.git

look also at X509_USER_{KEY,CERT} variables
---

diff --git a/org.glite.lb.common/test/test_gss.cpp b/org.glite.lb.common/test/test_gss.cpp
index 89a0c86..4a18b8f 100644
--- a/org.glite.lb.common/test/test_gss.cpp
+++ b/org.glite.lb.common/test/test_gss.cpp
@@ -65,16 +65,20 @@ void GSSTest::setUp(void) {
 	edg_wll_GssStatus stat;
 	struct sockaddr_in      a;
 	socklen_t 		alen = sizeof(a);
-	char *			cred_file = NULL;
+	char *			cert_file = NULL;
 	char *			key_file = NULL;
 
 	timeout.tv_sec = 10;
 	timeout.tv_usec = 0;
 	
-	key_file = cred_file = getenv("X509_USER_PROXY");
-	CPPUNIT_ASSERT_MESSAGE("credential file", cred_file);
+	key_file = cert_file = getenv("X509_USER_PROXY");
+	if (!key_file) {
+		key_file = getenv("X509_USER_KEY");
+		cert_file = getenv("X509_USER_CERT");
+	}
+	CPPUNIT_ASSERT_MESSAGE("credential file", cert_file);
 	
-	if (edg_wll_gss_acquire_cred_gsi(cred_file, key_file, &my_cred, &my_subject, &stat))
+	if (edg_wll_gss_acquire_cred_gsi(cert_file, key_file, &my_cred, &my_subject, &stat))
 		CPPUNIT_ASSERT_MESSAGE("gss_acquire_cred", 0);
 	
         sock = socket(PF_INET,SOCK_STREAM,0);