From 14da941e04e40832b4396846bd1af7803bdf58e4 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 05 2015 13:15:54 +0000
Subject: import cifs-utils-6.2-7.el7


---

diff --git a/SOURCES/0001-cifs-use-krb5_kt_default-to-determine-default-keytab.patch b/SOURCES/0001-cifs-use-krb5_kt_default-to-determine-default-keytab.patch
new file mode 100644
index 0000000..33ca920
--- /dev/null
+++ b/SOURCES/0001-cifs-use-krb5_kt_default-to-determine-default-keytab.patch
@@ -0,0 +1,58 @@
+From d32db5e1e2c32f0634a26de277fd91daf47ce32d Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@samba.org>
+Date: Mon, 7 Apr 2014 14:35:17 -0400
+Subject: [PATCH] cifs: use krb5_kt_default() to determine default keytab
+ location
+
+...don't assume that it's in /etc/krb5.keytab.
+
+Reported-by: Konstantin Lepikhov <klepikho@redhat.com>
+Signed-off-by: Jeff Layton <jlayton@samba.org>
+(cherry picked from commit a016e18969d10e3c777f35fe21b1c1f8c1d70880)
+Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
+---
+ cifs.upcall.c | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/cifs.upcall.c b/cifs.upcall.c
+index cc65824..e8544c2 100644
+--- a/cifs.upcall.c
++++ b/cifs.upcall.c
+@@ -55,7 +55,6 @@
+ #define	CIFS_DEFAULT_KRB5_DIR		"/tmp"
+ #define	CIFS_DEFAULT_KRB5_USER_DIR	"/run/user/%U"
+ #define	CIFS_DEFAULT_KRB5_PREFIX	"krb5cc"
+-#define CIFS_DEFAULT_KRB5_KEYTAB	"/etc/krb5.keytab"
+ 
+ #define	MAX_CCNAME_LEN			PATH_MAX + 5
+ 
+@@ -205,9 +204,15 @@ init_cc_from_keytab(const char *keytab_name, const char *user)
+ 		goto icfk_cleanup;
+ 	}
+ 
+-	ret = krb5_kt_resolve(context, keytab_name, &keytab);
++	if (keytab_name)
++		ret = krb5_kt_resolve(context, keytab_name, &keytab);
++	else
++		ret = krb5_kt_default(context, &keytab);
++
+ 	if (ret) {
+-		syslog(LOG_DEBUG, "krb5_kt_resolve: %d", (int)ret);
++		syslog(LOG_DEBUG, "%s: %d",
++			keytab_name ? "krb5_kt_resolve" : "krb5_kt_default",
++			(int)ret);
+ 		goto icfk_cleanup;
+ 	}
+ 
+@@ -841,7 +846,7 @@ int main(const int argc, char *const argv[])
+ 	struct decoded_args arg;
+ 	const char *oid;
+ 	uid_t uid;
+-	char *keytab_name = CIFS_DEFAULT_KRB5_KEYTAB;
++	char *keytab_name = NULL;
+ 	time_t best_time = 0;
+ 
+ 	hostbuf[0] = '\0';
+-- 
+1.9.3
+
diff --git a/SPECS/cifs-utils.spec b/SPECS/cifs-utils.spec
index 7ebe03e..13824c5 100644
--- a/SPECS/cifs-utils.spec
+++ b/SPECS/cifs-utils.spec
@@ -3,7 +3,7 @@
 
 Name:            cifs-utils
 Version:         6.2
-Release:         6%{pre_release}%{?dist}
+Release:         7%{pre_release}%{?dist}
 Summary:         Utilities for mounting and managing CIFS mounts
 
 Group:           System Environment/Daemons
@@ -24,6 +24,7 @@ Patch3:          0003-asn1-remove-some-usused-functions.patch
 Patch4:          0004-data_blob-clean-out-unused-functions.patch
 Patch5:          0005-mount.cifs-fix-bad-free-of-string-returned-by-dirnam.patch
 Patch6:		 0001-asn1-fix-use-after-free-in-asn1_write.patch
+Patch7:		 0001-cifs-use-krb5_kt_default-to-determine-default-keytab.patch
 
 %description
 The SMB/CIFS protocol is a standard file sharing protocol widely deployed
@@ -50,6 +51,7 @@ necessary for building ID mapping plugins for cifs-utils.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 %configure --prefix=/usr ROOTSBINDIR=%{_sbindir}
@@ -99,6 +101,9 @@ fi
 %{_includedir}/cifsidmap.h
 
 %changelog
+* Fri Aug 29 2014 Sachin Prabhu <sprabhu@redhat.com> - 6.2-7
+-  use krb5_kt_default() to determine default keytab location (bz#1083795)
+
 * Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 6.2-6
 - Mass rebuild 2014-01-24