call globus_module_activate(GLOBUS_GSI_GSS_ASSIST_MODULE) before any

globus_gss_assist() call to ensure the module is activated

diff --git a/openssh/auth1.c b/openssh/auth1.c
index ea570d1b9f5807b23af10df9bc20977443f962d6..3af2b66f5649d25deae1d0d765a37bb2884c94e2 100644 (file)
--- a/openssh/auth1.c
+++ b/openssh/auth1.c
@@ -63,6 +63,11 @@ auth1_gss_protocol_error(int type, u_int32_t plen, void *ctxt)
 int
 gsi_gridmap(char *subject_name, char **mapped_name)
 {
+#ifdef GLOBUS_GSI_GSS_ASSIST_MODULE
+    if (globus_module_activate(GLOBUS_GSI_GSS_ASSIST_MODULE) != 0) {
+       return 0;
+    }
+#endif
     return(globus_gss_assist_gridmap(subject_name, mapped_name) == 0);
 }
 #endif

diff --git a/openssh/gss-serv.c b/openssh/gss-serv.c
index 84a7546aae73f6f863fd1efe25e27b3f1c1d70b3..2c04b6df7cd327f8bfb18e56726b4036812022fe 100644 (file)
--- a/openssh/gss-serv.c
+++ b/openssh/gss-serv.c
@@ -276,7 +276,13 @@ ssh_gssapi_gsi_userok(char *name)
 {
     int authorized = 0;
     
-    /* This returns 0 on success */
+#ifdef GLOBUS_GSI_GSS_ASSIST_MODULE
+    if (globus_module_activate(GLOBUS_GSI_GSS_ASSIST_MODULE) != 0) {
+       return 0;
+    }
+#endif
+
+    /* globus_gss_assist_userok() returns 0 on success */
     authorized = (globus_gss_assist_userok(gssapi_client_name.value,
                                           name) == 0);
     
@@ -292,6 +298,11 @@ ssh_gssapi_gsi_userok(char *name)
 int
 ssh_gssapi_gsi_localname(char **user)
 {
+#ifdef GLOBUS_GSI_GSS_ASSIST_MODULE
+    if (globus_module_activate(GLOBUS_GSI_GSS_ASSIST_MODULE) != 0) {
+       return 0;
+    }
+#endif
     return(globus_gss_assist_gridmap(gssapi_client_name.value, user) == 0);
 }
 
@@ -356,14 +367,14 @@ ssh_gssapi_gsi_storecreds(gss_buffer_t export_buffer)
                        }
                        else
                        {
-                               log("Failed to parse delegated credentials string '%s'",
-                                   creds_env);
+                           log("Failed to parse delegated credentials string '%s'",
+                               creds_env);
                        }
                }
                else
                {
-                       log("Failed to export delegated credentials (error %ld)",
-                           major_status);
+                   log("Failed to export delegated credentials (error %d)",
+                       major_status);
                }
        }
        return 0;