|
 |
c5e826 |
From cc173629f30fbc885ee90e52a205554b118e0ee6 Mon Sep 17 00:00:00 2001
|
|
|
c5e826 |
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrezina@redhat.com>
|
|
|
c5e826 |
Date: Mon, 11 Jan 2021 13:11:39 +0100
|
|
|
c5e826 |
Subject: [PATCH 38/39] gssapi: default pam_gssapi_services to NULL in domain
|
|
|
c5e826 |
section
|
|
|
c5e826 |
|
|
|
c5e826 |
We need to distinguish when the option is not set in domain section and when
|
|
|
c5e826 |
it is is explicitly disabled. Now if it is not set, domain->gssapi_services
|
|
|
c5e826 |
is NULL and we'll use value from the pam section.
|
|
|
c5e826 |
|
|
|
c5e826 |
Without this change, the value in the pam section is ignored.
|
|
|
c5e826 |
|
|
|
c5e826 |
Reviewed-by: Alexey Tikhonov <atikhono@redhat.com>
|
|
|
c5e826 |
Reviewed-by: Sumit Bose <sbose@redhat.com>
|
|
|
c5e826 |
---
|
|
|
c5e826 |
src/confdb/confdb.c | 2 +-
|
|
|
c5e826 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
c5e826 |
|
|
|
c5e826 |
diff --git a/src/confdb/confdb.c b/src/confdb/confdb.c
|
|
|
c5e826 |
index 2881ce5da..befcfff2d 100644
|
|
|
c5e826 |
--- a/src/confdb/confdb.c
|
|
|
c5e826 |
+++ b/src/confdb/confdb.c
|
|
|
c5e826 |
@@ -1582,7 +1582,7 @@ static int confdb_get_domain_internal(struct confdb_ctx *cdb,
|
|
|
c5e826 |
}
|
|
|
c5e826 |
|
|
|
c5e826 |
tmp = ldb_msg_find_attr_as_string(res->msgs[0], CONFDB_PAM_GSSAPI_SERVICES,
|
|
|
c5e826 |
- "-");
|
|
|
c5e826 |
+ NULL);
|
|
|
c5e826 |
if (tmp != NULL) {
|
|
|
c5e826 |
ret = split_on_separator(domain, tmp, ',', true, true,
|
|
|
c5e826 |
&domain->gssapi_services, NULL);
|
|
|
c5e826 |
--
|
|
|
c5e826 |
2.21.3
|
|
|
c5e826 |
|