|
 |
fecbd34 |
From d10e85eada71599caebb56fde50dd42bbbf6b65d Mon Sep 17 00:00:00 2001
|
|
|
fecbd34 |
From: Brian Bockelman <bbockelm@cse.unl.edu>
|
|
|
fecbd34 |
Date: Tue, 28 Jul 2015 21:24:36 -0500
|
|
|
fecbd34 |
Subject: [PATCH] Allow compilation with both old and new Globus version. #5180
|
|
|
fecbd34 |
|
|
|
fecbd34 |
The signature of globus_gsi_cred_write_proxy changed from
|
|
|
fecbd34 |
|
|
|
fecbd34 |
globus_result_t
|
|
|
fecbd34 |
globus_gsi_cred_write_proxy(globus_l_gsi_cred_handle_s*, char*)
|
|
|
fecbd34 |
|
|
|
fecbd34 |
to
|
|
|
fecbd34 |
|
|
|
fecbd34 |
globus_result_t
|
|
|
fecbd34 |
globus_gsi_cred_write_proxy(globus_l_gsi_cred_handle_s*, const char*)
|
|
|
fecbd34 |
|
|
|
fecbd34 |
This causes a function pointer assignment to fail. Since we want to support
|
|
|
fecbd34 |
both the old and new interface, simply reinterpret_cast the pointer to the
|
|
|
fecbd34 |
correct type.
|
|
|
fecbd34 |
|
|
|
fecbd34 |
Tested compilation against both globus-gsi-credential 7.7 and 7.9.
|
|
|
fecbd34 |
---
|
|
|
fecbd34 |
src/condor_utils/globus_utils.cpp | 2 +-
|
|
|
fecbd34 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
fecbd34 |
|
|
|
fecbd34 |
diff --git a/src/condor_utils/globus_utils.cpp b/src/condor_utils/globus_utils.cpp
|
|
|
fecbd34 |
index 2027e3e..1810b74 100644
|
|
|
fecbd34 |
--- a/src/condor_utils/globus_utils.cpp
|
|
|
fecbd34 |
+++ b/src/condor_utils/globus_utils.cpp
|
|
|
fecbd34 |
@@ -354,7 +354,7 @@ activate_globus_gsi( void )
|
|
|
fecbd34 |
globus_gsi_cred_handle_destroy_ptr = globus_gsi_cred_handle_destroy;
|
|
|
fecbd34 |
globus_gsi_cred_handle_init_ptr = globus_gsi_cred_handle_init;
|
|
|
fecbd34 |
globus_gsi_cred_read_proxy_ptr = globus_gsi_cred_read_proxy;
|
|
|
fecbd34 |
- globus_gsi_cred_write_proxy_ptr = globus_gsi_cred_write_proxy;
|
|
|
fecbd34 |
+ globus_gsi_cred_write_proxy_ptr = reinterpret_cast<globus_result_t (*)(globus_l_gsi_cred_handle_s*, char*)>(globus_gsi_cred_write_proxy);
|
|
|
fecbd34 |
globus_gsi_proxy_assemble_cred_ptr = globus_gsi_proxy_assemble_cred;
|
|
|
fecbd34 |
globus_gsi_proxy_create_req_ptr = globus_gsi_proxy_create_req;
|
|
|
fecbd34 |
globus_gsi_proxy_handle_attrs_destroy_ptr = globus_gsi_proxy_handle_attrs_destroy;
|