From 9bc9b8e6161edfa4f689ca2ed7f2b055170b45b6 Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Nov 07 2013 03:44:42 +0000
Subject: Fix bz1017292


---

diff --git a/0001-Improve-auto-detection.patch b/0001-Improve-auto-detection.patch
new file mode 100644
index 0000000..d810914
--- /dev/null
+++ b/0001-Improve-auto-detection.patch
@@ -0,0 +1,28 @@
+From b21b4ce0bc3962510bd79361160ee629b161f4fd Mon Sep 17 00:00:00 2001
+From: Simo Sorce <simo@redhat.com>
+Date: Wed, 9 Oct 2013 10:55:09 -0400
+Subject: [PATCH] Improve auto detection.
+
+If the user has an explicitly set KRB5CCNAME, assume he is using kerberos
+even if the ccache is still empty.
+---
+ src/ka-applet.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/ka-applet.c b/src/ka-applet.c
+index 2b48825d2a5bf8c47c713ba6d59a9865a10b6fd8..025318896c04885f690281716f366570b71ede1b 100644
+--- a/src/ka-applet.c
++++ b/src/ka-applet.c
+@@ -132,7 +132,8 @@ ka_applet_command_line (GApplication            *application,
+     KA_DEBUG ("Evaluating command line");
+ 
+     if (!self->priv->startup_ccache &&
+-        self->priv->auto_run)
++        self->priv->auto_run &&
++        !getenv("KRB5CCNAME"))
+         ka_applet_destroy (self);
+     else
+         ka_applet_activate (application);
+-- 
+1.8.3.1
+
diff --git a/krb5-auth-dialog.spec b/krb5-auth-dialog.spec
index 04f903e..c26539f 100644
--- a/krb5-auth-dialog.spec
+++ b/krb5-auth-dialog.spec
@@ -1,7 +1,7 @@
 Summary: Kerberos 5 authentication dialog
 Name: krb5-auth-dialog
 Version: 3.2.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: User Interface/X
 URL: https://honk.sigxcpu.org/piki/projects/krb5-auth-dialog/
@@ -9,6 +9,7 @@ Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.2/%{name}-%{version}.t
 
 # avoid annoying notifications
 Patch0: krb5-auth-dialog-autostart.patch
+Patch1: 0001-Improve-auto-detection.patch
 
 BuildRequires: krb5-devel
 BuildRequires: perl(XML::Parser), gettext
@@ -36,6 +37,7 @@ tickets are about to expire and lets them renew them.
 %prep
 %setup -q
 %patch0 -p1 -b .autostart
+%patch1 -p1 -b .autodetect
 
 autoreconf -i -f
 
@@ -84,6 +86,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Wed Nov 06 2013 Simo Sorce <simo@redhat.com> - 3.2.1-7
+- Fix bz1017292
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild