|
 |
464b57 |
From 5774526cf66d1e48b2226050e4dfeff394849771 Mon Sep 17 00:00:00 2001
|
|
|
464b57 |
From: =?UTF-8?q?Pawe=C5=82=20Po=C5=82awski?= <ppolawsk@redhat.com>
|
|
|
464b57 |
Date: Wed, 29 Apr 2020 12:48:40 +0200
|
|
|
464b57 |
Subject: [PATCH] DOMAIN: Downgrade log message type
|
|
|
464b57 |
|
|
|
464b57 |
Not all domains contains flat name.
|
|
|
464b57 |
This is specific and in most cases needed for AD domain.
|
|
|
464b57 |
In case of AD domain flat name checking and failure log already exists:
|
|
|
464b57 |
src/providers/ad/ad_domain_info.c +104
|
|
|
464b57 |
|
|
|
464b57 |
src/util/usertools.c contains more generic domain related
|
|
|
464b57 |
functions. In those cases missing of flat_name should not be
|
|
|
464b57 |
considered as failure.
|
|
|
464b57 |
|
|
|
464b57 |
Resolves:
|
|
|
464b57 |
https://github.com/SSSD/sssd/issues/1032
|
|
|
464b57 |
|
|
|
464b57 |
Reviewed-by: Sumit Bose <sbose@redhat.com>
|
|
|
464b57 |
(cherry picked from commit 4c93aa76d93fa786d52f78cd76d3afd94ee75ea2)
|
|
|
464b57 |
---
|
|
|
464b57 |
src/util/usertools.c | 4 ++--
|
|
|
464b57 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
464b57 |
|
|
|
464b57 |
diff --git a/src/util/usertools.c b/src/util/usertools.c
|
|
|
464b57 |
index 33f4f7811..4e63f4e05 100644
|
|
|
464b57 |
--- a/src/util/usertools.c
|
|
|
464b57 |
+++ b/src/util/usertools.c
|
|
|
464b57 |
@@ -561,8 +561,8 @@ calc_flat_name(struct sss_domain_info *domain)
|
|
|
464b57 |
|
|
|
464b57 |
s = domain->flat_name;
|
|
|
464b57 |
if (s == NULL) {
|
|
|
464b57 |
- DEBUG(SSSDBG_MINOR_FAILURE, "Flat name requested but domain has no"
|
|
|
464b57 |
- "flat name set, falling back to domain name\n");
|
|
|
464b57 |
+ DEBUG(SSSDBG_FUNC_DATA, "Domain has no flat name set,"
|
|
|
464b57 |
+ "using domain name instead\n");
|
|
|
464b57 |
s = domain->name;
|
|
|
464b57 |
}
|
|
|
464b57 |
|
|
|
464b57 |
--
|
|
|
464b57 |
2.21.1
|
|
|
464b57 |
|