fix compilation warnings in Simon's latest GSSAPI patch

diff --git a/openssh/clientloop.c b/openssh/clientloop.c
index 27150277bf8734c4dac40f135bcd5c197d335119..afd91c1eaaac5385d1d481868651e5abfea8139c 100644 (file)
--- a/openssh/clientloop.c
+++ b/openssh/clientloop.c
@@ -1436,7 +1436,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
 
 #ifdef GSSAPI
                        if (options.gss_renewal_rekey &&
-                           ssh_gssapi_credentials_updated(GSS_C_NO_CONTEXT)) {
+                           ssh_gssapi_credentials_updated((Gssctxt *)GSS_C_NO_CONTEXT)) {
                                debug("credentials updated - forcing rekey");
                                need_rekeying = 1;
                        }

diff --git a/openssh/gss-genr.c b/openssh/gss-genr.c
index a8255c3e2c72a193d66efa47a520f0815d6da3ba..81b85ba43dcdf3760d417bf7f2df5d7770983ec9 100644 (file)
--- a/openssh/gss-genr.c
+++ b/openssh/gss-genr.c
@@ -513,7 +513,6 @@ ssh_gssapi_credentials_updated(Gssctxt *ctxt) {
        static OM_uint32 last_call = 0;
        OM_uint32 lifetime, now, major, minor;
        int equal;
-       gss_cred_usage_t usage = GSS_C_INITIATE;
        
        now = time(NULL);
 

diff --git a/openssh/gss-serv.c b/openssh/gss-serv.c
index e1b2b433150f1476909c56221ac04c681dd7afa7..de0f7d589712153ebdb289b241349768abb57f12 100644 (file)
--- a/openssh/gss-serv.c
+++ b/openssh/gss-serv.c
@@ -530,7 +530,6 @@ static int ssh_gssapi_simple_conv(int n, const struct pam_message **msg,
 void
 ssh_gssapi_rekey_creds() {
        int ok;
-       int ret;
 #ifdef USE_PAM
        pam_handle_t *pamh = NULL;
        struct pam_conv pamconv = {ssh_gssapi_simple_conv, NULL};

diff --git a/openssh/ssh-gss.h b/openssh/ssh-gss.h
index dcb9bca4cfe5bd9e5c7eb76bd8460f09274ef39e..f0009c80e3a42d3d3aad9c10d8ddbb0420ca57e3 100644 (file)
--- a/openssh/ssh-gss.h
+++ b/openssh/ssh-gss.h
@@ -141,6 +141,7 @@ OM_uint32 ssh_gssapi_client_identity(Gssctxt *, const char *);
 int ssh_gssapi_credentials_updated(Gssctxt *);
 
 int ssh_gssapi_localname(char **name);
+void ssh_gssapi_rekey_creds();
 
 /* In the server */
 typedef int ssh_gssapi_check_fn(Gssctxt **, gss_OID, const char *,