Skip to content

Commit

Permalink
Allow compilation with both old and new Globus version. #5180
Browse files Browse the repository at this point in the history
The signature of globus_gsi_cred_write_proxy changed from

globus_result_t
globus_gsi_cred_write_proxy(globus_l_gsi_cred_handle_s*, char*)

to

globus_result_t
globus_gsi_cred_write_proxy(globus_l_gsi_cred_handle_s*, const char*)

This causes a function pointer assignment to fail.  Since we want to support
both the old and new interface, simply reinterpret_cast the pointer to the
correct type.

Tested compilation against both globus-gsi-credential 7.7 and 7.9.
  • Loading branch information
bbockelm committed Jul 29, 2015
1 parent 2bc0001 commit d10e85e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/condor_utils/globus_utils.cpp
Expand Up @@ -354,7 +354,7 @@ activate_globus_gsi( void )
globus_gsi_cred_handle_destroy_ptr = globus_gsi_cred_handle_destroy;
globus_gsi_cred_handle_init_ptr = globus_gsi_cred_handle_init;
globus_gsi_cred_read_proxy_ptr = globus_gsi_cred_read_proxy;
globus_gsi_cred_write_proxy_ptr = globus_gsi_cred_write_proxy;
globus_gsi_cred_write_proxy_ptr = reinterpret_cast<globus_result_t (*)(globus_l_gsi_cred_handle_s*, char*)>(globus_gsi_cred_write_proxy);
globus_gsi_proxy_assemble_cred_ptr = globus_gsi_proxy_assemble_cred;
globus_gsi_proxy_create_req_ptr = globus_gsi_proxy_create_req;
globus_gsi_proxy_handle_attrs_destroy_ptr = globus_gsi_proxy_handle_attrs_destroy;
Expand Down

0 comments on commit d10e85e

Please sign in to comment.