aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2017-11-11 14:23:34 +0100
committerGuido Günther <agx@sigxcpu.org>2017-11-11 14:23:41 +0100
commit35b4dedb8b15eb436b5ad986ff097c6897528bcb (patch)
treecda25130ff7f566b12083b28e5f653d118d51b19
parentUpdate upstream source from tag 'upstream/3.26.0' (diff)
downloadkrb5-auth-dialog-35b4dedb8b15eb436b5ad986ff097c6897528bcb.tar.gz
krb5-auth-dialog-35b4dedb8b15eb436b5ad986ff097c6897528bcb.tar.bz2
krb5-auth-dialog-35b4dedb8b15eb436b5ad986ff097c6897528bcb.zip
Drop credentials_expiring_real-check-if-kcontext-is-valid.patch
Fixed upstream.
-rw-r--r--debian/patches/credentials_expiring_real-check-if-kcontext-is-valid.patch36
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 37 deletions
diff --git a/debian/patches/credentials_expiring_real-check-if-kcontext-is-valid.patch b/debian/patches/credentials_expiring_real-check-if-kcontext-is-valid.patch
deleted file mode 100644
index d4d1ab1..0000000
--- a/debian/patches/credentials_expiring_real-check-if-kcontext-is-valid.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Fri, 7 Jul 2017 09:10:37 +0200
-Subject: credentials_expiring_real: check if kcontext is valid
-
-othewise we might crash when the credentials_expiring_once fires but
-we're already shutting down.
-
-LP: #1700468
----
- src/ka-kerberos.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/ka-kerberos.c b/src/ka-kerberos.c
-index 14fb03e..59f6b8b 100644
---- a/src/ka-kerberos.c
-+++ b/src/ka-kerberos.c
-@@ -222,6 +222,9 @@ credentials_expiring_real (KaApplet *applet)
- krb5_timestamp now;
- gboolean retval = FALSE;
-
-+ if (!kcontext_valid)
-+ return retval;
-+
- memset (&my_creds, 0, sizeof (my_creds));
- ka_applet_set_tgt_renewable (applet, FALSE);
- if (!ka_get_tgt_from_ccache (kcontext, &my_creds)) {
-@@ -947,8 +950,8 @@ static gboolean
- ka_krb5_context_free ()
- {
- if (kcontext_valid) {
-- krb5_free_context (kcontext);
- kcontext_valid = FALSE;
-+ krb5_free_context (kcontext);
- }
- return TRUE;
- }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 410b950..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-credentials_expiring_real-check-if-kcontext-is-valid.patch
bgstack15