From 750c510348f979f75a0b983f181b315a3e90fbe7 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Fri, 20 Jun 2014 06:49:29 +0200 Subject: Remove patches appplied upstream --- ...incipal_compare-crashes-on-NULL-arguments.patch | 26 ---------------------- debian/patches/series | 1 - 2 files changed, 27 deletions(-) delete mode 100644 debian/patches/0001-krb5_principal_compare-crashes-on-NULL-arguments.patch delete mode 100644 debian/patches/series diff --git a/debian/patches/0001-krb5_principal_compare-crashes-on-NULL-arguments.patch b/debian/patches/0001-krb5_principal_compare-crashes-on-NULL-arguments.patch deleted file mode 100644 index 44dd70d..0000000 --- a/debian/patches/0001-krb5_principal_compare-crashes-on-NULL-arguments.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Petter Reinholdtsen -Date: Thu, 4 Jul 2013 09:32:18 +0200 -Subject: krb5_principal_compare crashes on NULL arguments - -Debian Bug #714825 ---- - src/ka-kerberos.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/ka-kerberos.c b/src/ka-kerberos.c -index db5cddd..0867234 100644 ---- a/src/ka-kerberos.c -+++ b/src/ka-kerberos.c -@@ -221,8 +221,10 @@ credentials_expiring_real (KaApplet *applet) - } - - /* copy principal from cache if any */ -- if (krb5_principal_compare (kcontext, my_creds.client, kprincipal)) { -- krb5_free_principal (kcontext, kprincipal); -+ if (kprincipal == NULL || -+ krb5_principal_compare (kcontext, my_creds.client, kprincipal)) { -+ if (kprincipal) -+ krb5_free_principal (kcontext, kprincipal); - krb5_copy_principal (kcontext, my_creds.client, &kprincipal); - } - creds_expiry = my_creds.times.endtime; diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index dc7e57e..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -0001-krb5_principal_compare-crashes-on-NULL-arguments.patch -- cgit