The man2html from jbasney on pkilab2 works whereas the standard one doesn't.

[gssapi-openssh.git] / openssh / gss-serv.c

diff --git a/openssh/gss-serv.c b/openssh/gss-serv.c
index 6fbc09db4d27958200c95f54b5f75dbc4fb0580c..ca1370f7f24207a2e4765a64d0781540bedad3f7 100644 (file)
--- a/openssh/gss-serv.c
+++ b/openssh/gss-serv.c
@@ -455,7 +455,7 @@ ssh_gssapi_do_child(char ***envp, u_int *envsizep)
 
 /* Privileged */
 int
-ssh_gssapi_userok(char *user, struct passwd *pw)
+ssh_gssapi_userok(char *user, struct passwd *pw, int gssapi_keyex)
 {
        OM_uint32 lmin;
 
@@ -611,7 +611,9 @@ ssh_gssapi_update_creds(ssh_gssapi_ccache *store) {
 void
 ssh_gssapi_get_client_info(char **userdn, char **mech) {
        *userdn = gssapi_client.displayname.value;
-       *mech = gssapi_client.mech->name;
+
+       if (gssapi_client.mech)
+               *mech = gssapi_client.mech->name;
 }
 
 #endif