|
 |
2fc102 |
From 4069c662c32836f8ebba7f091c44f9db2a1ef62e Mon Sep 17 00:00:00 2001
|
|
|
2fc102 |
From: Sumit Bose <sbose@redhat.com>
|
|
|
2fc102 |
Date: Thu, 20 Mar 2014 18:39:48 +0100
|
|
|
2fc102 |
Subject: [PATCH 114/117] krb5_child: remove unused option lifetime_str from
|
|
|
2fc102 |
k5c_setup_fast()
|
|
|
2fc102 |
|
|
|
2fc102 |
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
|
|
|
2fc102 |
---
|
|
|
2fc102 |
src/providers/krb5/krb5_child.c | 9 +++------
|
|
|
2fc102 |
1 file changed, 3 insertions(+), 6 deletions(-)
|
|
|
2fc102 |
|
|
|
2fc102 |
diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c
|
|
|
2fc102 |
index af303e6c8c507c7cef108027c49cc4adb74162e7..7f07efc161d0242e64bd67e13dec9a3faa9f2e30 100644
|
|
|
2fc102 |
--- a/src/providers/krb5/krb5_child.c
|
|
|
2fc102 |
+++ b/src/providers/krb5/krb5_child.c
|
|
|
2fc102 |
@@ -1666,7 +1666,7 @@ static errno_t k5c_recv_data(struct krb5_req *kr, int fd, uint32_t *offline)
|
|
|
2fc102 |
return ret;
|
|
|
2fc102 |
}
|
|
|
2fc102 |
|
|
|
2fc102 |
-static int k5c_setup_fast(struct krb5_req *kr, char *lifetime_str, bool demand)
|
|
|
2fc102 |
+static int k5c_setup_fast(struct krb5_req *kr, bool demand)
|
|
|
2fc102 |
{
|
|
|
2fc102 |
krb5_principal fast_princ_struct;
|
|
|
2fc102 |
krb5_data *realm_data;
|
|
|
2fc102 |
@@ -1675,9 +1675,6 @@ static int k5c_setup_fast(struct krb5_req *kr, char *lifetime_str, bool demand)
|
|
|
2fc102 |
krb5_error_code kerr;
|
|
|
2fc102 |
char *tmp_str;
|
|
|
2fc102 |
|
|
|
2fc102 |
- DEBUG(SSSDBG_CONF_SETTINGS, ("%s is set to [%s]\n",
|
|
|
2fc102 |
- SSSD_KRB5_LIFETIME, lifetime_str));
|
|
|
2fc102 |
-
|
|
|
2fc102 |
tmp_str = getenv(SSSD_KRB5_FAST_PRINCIPAL);
|
|
|
2fc102 |
if (tmp_str) {
|
|
|
2fc102 |
DEBUG(SSSDBG_CONF_SETTINGS, ("%s is set to [%s]\n",
|
|
|
2fc102 |
@@ -1869,9 +1866,9 @@ static int k5c_setup(struct krb5_req *kr, uint32_t offline)
|
|
|
2fc102 |
if (use_fast_str == NULL || strcasecmp(use_fast_str, "never") == 0) {
|
|
|
2fc102 |
DEBUG(SSSDBG_CONF_SETTINGS, ("Not using FAST.\n"));
|
|
|
2fc102 |
} else if (strcasecmp(use_fast_str, "try") == 0) {
|
|
|
2fc102 |
- kerr = k5c_setup_fast(kr, lifetime_str, false);
|
|
|
2fc102 |
+ kerr = k5c_setup_fast(kr, false);
|
|
|
2fc102 |
} else if (strcasecmp(use_fast_str, "demand") == 0) {
|
|
|
2fc102 |
- kerr = k5c_setup_fast(kr, lifetime_str, true);
|
|
|
2fc102 |
+ kerr = k5c_setup_fast(kr, true);
|
|
|
2fc102 |
} else {
|
|
|
2fc102 |
DEBUG(SSSDBG_CRIT_FAILURE,
|
|
|
2fc102 |
("Unsupported value [%s] for krb5_use_fast.\n",
|
|
|
2fc102 |
--
|
|
|
2fc102 |
1.8.5.3
|
|
|
2fc102 |
|