summaryrefslogtreecommitdiff
path: root/src/providers/krb5/krb5_auth.c
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2013-08-30 12:21:39 -0400
committerSimo Sorce <simo@redhat.com>2013-09-09 15:11:45 -0400
commit5dc3b01fd9b2fa244e7c2820ce04602c9f059370 (patch)
tree9578ba44fc6d29e2551b78d5ce1589df787d9c77 /src/providers/krb5/krb5_auth.c
parentbfd32c9e8f302d7722838a68572c6801f5640657 (diff)
downloadsssd-5dc3b01fd9b2fa244e7c2820ce04602c9f059370.tar.gz
sssd-5dc3b01fd9b2fa244e7c2820ce04602c9f059370.tar.bz2
sssd-5dc3b01fd9b2fa244e7c2820ce04602c9f059370.zip
krb5: move template check to initializzation
The randomized template check realy only makes sense for the FILE ccache which is the only one that normally needs to use randomizing chars. Also it is better to warn the admin early rather than to warn 'when it is too late'. So move the check at initialization time when we determine what the template actually is. Resolves: https://fedorahosted.org/sssd/ticket/2061
Diffstat (limited to 'src/providers/krb5/krb5_auth.c')
-rw-r--r--src/providers/krb5/krb5_auth.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/providers/krb5/krb5_auth.c b/src/providers/krb5/krb5_auth.c
index 178f18a3..ca00ce7a 100644
--- a/src/providers/krb5/krb5_auth.c
+++ b/src/providers/krb5/krb5_auth.c
@@ -60,7 +60,6 @@ check_old_ccache(const char *old_ccache, struct krb5child_req *kr,
const char *realm, bool *active, bool *valid)
{
struct sss_krb5_cc_be *old_cc_ops;
- const char *cc_template;
errno_t ret;
/* ccache file might be of a different type if the user changed
@@ -73,10 +72,8 @@ check_old_ccache(const char *old_ccache, struct krb5child_req *kr,
return EINVAL;
}
- cc_template = dp_opt_get_cstring(kr->krb5_ctx->opts, KRB5_CCNAME_TMPL);
-
ret = old_cc_ops->check_existing(old_ccache, kr->uid, realm, kr->upn,
- cc_template, valid);
+ valid);
if (ret == ENOENT) {
DEBUG(SSSDBG_TRACE_FUNC,
("Saved ccache %s doesn't exist.\n", old_ccache));