From db5d66a5072fed3b0983cd21ee48f5c290939ca6 Mon Sep 17 00:00:00 2001
From: basney <basney>
Date: Mon, 31 Aug 2009 19:07:19 +0000
Subject: [PATCH] fix compilation warnings in Simon's latest GSSAPI patch

---
 openssh/clientloop.c | 2 +-
 openssh/gss-genr.c   | 1 -
 openssh/gss-serv.c   | 1 -
 openssh/ssh-gss.h    | 1 +
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/openssh/clientloop.c b/openssh/clientloop.c
index 2715027..afd91c1 100644
--- 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 a8255c3..81b85ba 100644
--- 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 e1b2b43..de0f7d5 100644
--- 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 dcb9bca..f0009c8 100644
--- 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 *, 
-- 
2.45.1