1 files changed, 14 insertions, 1 deletions

diff --git a/clientloop.c b/clientloop.c
index ad35cb7ba..e69c5141f 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -112,6 +112,10 @@
 #include "ssherr.h"
 #include "hostfile.h"
 
+#ifdef GSSAPI
+#include "ssh-gss.h"
+#endif
+
 /* import options */
 extern Options options;
 
@@ -1357,9 +1361,18 @@ client_loop(struct ssh *ssh, int have_pty, int escape_char_arg,
                         break;
 
                 /* Do channel operations unless rekeying in progress. */
-                if (!ssh_packet_is_rekeying(ssh))
+                if (!ssh_packet_is_rekeying(ssh)) {
                         channel_after_select(ssh, readset, writeset);
 
+#ifdef GSSAPI
+                        if (options.gss_renewal_rekey &&
+                            ssh_gssapi_credentials_updated(NULL)) {
+                                debug("credentials updated - forcing rekey");
+                                need_rekeying = 1;
+                        }
+#endif
+                }
+
                 /* Buffer input from the connection.  */
                 client_process_net_input(readset);