Avoid calling into Kerberos libraries from ssh_gssapi_server_mechanisms in the privsep monitor.

1 files changed, 4 insertions, 5 deletions

diff --git a/gss-serv.c b/gss-serv.c
index 2f6baf70d..2e27cbf9c 100644
--- a/gss-serv.c
+++ b/gss-serv.c
@@ -149,11 +149,10 @@ ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID oid)
 /* Unprivileged */
 char *
 ssh_gssapi_server_mechanisms(void) {
-        gss_OID_set     supported;
-
-        ssh_gssapi_supported_oids(&supported);
-        return (ssh_gssapi_kex_mechs(supported, &ssh_gssapi_server_check_mech,
-            NULL, NULL));
+        if (supported_oids == NULL)
+                ssh_gssapi_prepare_supported_oids();
+        return (ssh_gssapi_kex_mechs(supported_oids,
+            &ssh_gssapi_server_check_mech, NULL, NULL));
 }
 
 /* Unprivileged */