remove separate forward_gssapi_globus_* flags for SSH1; use gss_*_deleg_* flags for...

diff --git a/openssh/readconf.c b/openssh/readconf.c
index 4243c295fb64b7e3af4af350318d94d584e946c6..1f35670d33739e7e62227d6ccbc324aec81b54da 100644 (file)
--- a/openssh/readconf.c
+++ b/openssh/readconf.c
@@ -788,10 +788,6 @@ initialize_options(Options * options)
         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 */
 
@@ -883,12 +879,6 @@ fill_default_options(Options * options)
 #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)

diff --git a/openssh/readconf.h b/openssh/readconf.h
index 6983644874b36bf720d790d3d2c34bbd7745739f..6a3823b02b78e19d26f8d1fa376c6c0bb08067a8 100644 (file)
--- a/openssh/readconf.h
+++ b/openssh/readconf.h
@@ -53,10 +53,6 @@ typedef struct {
        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 */
 

diff --git a/openssh/ssh.c b/openssh/ssh.c
index e02a2ae846a2ecffabbe07b92e846d4d3165a487..2984a597fb88c200042e137c9f62ae49ea24414a 100644 (file)
--- a/openssh/ssh.c
+++ b/openssh/ssh.c
@@ -347,13 +347,6 @@ again:
                        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;

diff --git a/openssh/sshconnect1.c b/openssh/sshconnect1.c
index e0c3676c2abbf3a9974ecf344a949652aaf44793..fd85c1b2f35da08202fbec2946638d1ac234de2d 100644 (file)
--- a/openssh/sshconnect1.c
+++ b/openssh/sshconnect1.c
@@ -1169,20 +1169,20 @@ int try_gssapi_authentication(char *host, Options *options)
   }
 #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);