add an explicit call to gss_initialize() at sshd startup when using mechglue

because otherwise, we'll have problems initializing later on if
privilege separation is enabled

diff --git a/openssh/ssh-gss.h b/openssh/ssh-gss.h
index 31e025ecb8a56861755b37b42e10b211cf258b7f..527622a4ed9e912134d29e36421dfe26b3195f85 100644 (file)
--- a/openssh/ssh-gss.h
+++ b/openssh/ssh-gss.h
@@ -145,6 +145,7 @@ int gsi_gridmap(char *subject_name, char **mapped_name);
 #endif
 
 #ifdef MECHGLUE
+void gss_initialize();
 gss_cred_id_t __gss_get_mechanism_cred
    (gss_cred_id_t,     /* union_cred */
     gss_OID            /* mech_type */

diff --git a/openssh/sshd.c b/openssh/sshd.c
index 21b10599a2314a44956804fbef99a28014a240d5..029ce6497af5d164106db82df614ea19343b43fb 100644 (file)
--- a/openssh/sshd.c
+++ b/openssh/sshd.c
@@ -1060,6 +1060,10 @@ main(int ac, char **av)
        ssh_gssapi_clean_env();
 #endif /* GSSAPI */
 
+#ifdef MECHGLUE
+       gss_initialize();
+#endif /* MECHGLUE */
+
        /*
         * Clear out any supplemental groups we may have inherited.  This
         * prevents inadvertent creation of files with bad modes (in the