options->gss_deleg_creds = -1;
#ifdef GSI
options->gss_globus_deleg_limited_proxy = -1;
-/*modified by binhe*/
- options->forward_gssapi_globus_proxy = -1;
- options->forward_gssapi_globus_limited_proxy = -1;
-/*end of modification*/
#endif /* GSI */
#endif /* GSSAPI */
#ifdef GSI
if (options->gss_globus_deleg_limited_proxy == -1)
options->gss_globus_deleg_limited_proxy = 0;
-/*modified by binhe*/
- if (options->forward_gssapi_globus_proxy == -1)
- options->forward_gssapi_globus_proxy = 0;
- if (options->forward_gssapi_globus_limited_proxy == -1)
- options->forward_gssapi_globus_limited_proxy = 0;
-/*end of modification*/
#endif /* GSI */
#endif /* GSSAPI */
#if defined(KRB4) || defined(KRB5)
int gss_deleg_creds;
#ifdef GSI
int gss_globus_deleg_limited_proxy;
-/*modified by binhe*/
- int forward_gssapi_globus_proxy;
- int forward_gssapi_globus_limited_proxy;
-/*end of modification*/
#endif /* GSI */
#endif /* GSSAPI */
break;
case 'a':
options.forward_agent = 0;
-/*modified by binhe*/
-#ifdef GSSAPI
-#ifdef GSI
- options.forward_gssapi_globus_proxy = 0;
-#endif /* GSI */
-#endif /* GSSAPI */
-/*end of modification*/
break;
case 'A':
options.forward_agent = 1;
}
#endif /* GSSAPI_KRB5 */
-#ifdef GSI
- if(options->forward_gssapi_globus_proxy) {
+#ifdef GSSAPI
+ if(options->gss_deleg_creds) {
debug("Forwarding X509 proxy certificate");
req_flags |= GSS_C_DELEG_FLAG;
}
#ifdef GSS_C_GLOBUS_LIMITED_DELEG_PROXY_FLAG
- /* Forward limited credentials, overrides forward_gssapi_globus_proxy */
- if(options->forward_gssapi_globus_limited_proxy) {
+ /* Forward limited credentials, overrides gss_deleg_creds */
+ if(options->gss_globus_deleg_limited_proxy) {
debug("Forwarding limited X509 proxy certificate");
req_flags |= (GSS_C_DELEG_FLAG | GSS_C_GLOBUS_LIMITED_DELEG_PROXY_FLAG);
}
#endif /* GSS_C_GLOBUS_LIMITED_DELEG_PROXY_FLAG */
-#endif /* GSI */
+#endif /* GSSAPI */
debug("req_flags = %lu", req_flags);