3e59d41df0
Add support for renewing AD membership with adcli. Wrap binaries with LDB_MODULES_PATH. Fix the sss_analyze utility to run without systemd libraries. Add native inputs to generate man pages and run additional tests during build. * gnu/packages/sssd.scm (sssd): Update to 2.7.0. [patches]: Drop patches applied upstream. Add a patch for sss_analyze. [inputs]: Add adcli, bash-minimal, jose, keyutils, libnl, pcre2, python. Drop augeas, pcre. [native-inputs]: Add cmocka, doxygen, gettext-minimal, libfaketime, libtool, openssh, po4a, softhsm. [arguments]: Rewrite in gexp style. Fix configure checks. Remove static library from install. Wrap binaries to set correct paths. * gnu/packages/patches/sssd-collision-with-external-nss-symbol.patch, gnu/packages/patches/sssd-fix-samba-4.15.3.patch, gnu/packages/patches/sssd-fix-samba.patch: Delete files. * gnu/packages/patches/sssd-optional-systemd.patch: New file. * gnu/local.mk (dist_patch_DATA): Update accordingly. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
Allow running sss_analyze without Python modules for systemd.
|
|
Upstream PR: https://github.com/SSSD/sssd/pull/6125
|
|
|
|
diff --git a/src/tools/analyzer/modules/request.py b/src/tools/analyzer/modules/request.py
|
|
index b96a23c05..28ac2f194 100644
|
|
--- a/src/tools/analyzer/modules/request.py
|
|
+++ b/src/tools/analyzer/modules/request.py
|
|
@@ -1,8 +1,6 @@
|
|
import re
|
|
import logging
|
|
|
|
-from sssd.source_files import Files
|
|
-from sssd.source_journald import Journald
|
|
from sssd.parser import SubparsersAction
|
|
from sssd.parser import Option
|
|
|
|
@@ -77,8 +75,10 @@ class RequestAnalyzer:
|
|
Instantiated source object
|
|
"""
|
|
if args.source == "journald":
|
|
+ from sssd.source_journald import Journald
|
|
source = Journald()
|
|
else:
|
|
+ from sssd.source_files import Files
|
|
source = Files(args.logdir)
|
|
return source
|
|
|
|
@@ -143,7 +143,7 @@ class RequestAnalyzer:
|
|
self.consumed_logs.append(line.rstrip(line[-1]))
|
|
else:
|
|
# files source includes newline
|
|
- if isinstance(source, Files):
|
|
+ if type(source).__name__ == 'Files':
|
|
print(line, end='')
|
|
else:
|
|
print(line)
|
|
@@ -225,7 +225,7 @@ class RequestAnalyzer:
|
|
source.set_component(component, False)
|
|
self.done = ""
|
|
for line in self.matched_line(source, patterns):
|
|
- if isinstance(source, Journald):
|
|
+ if type(source).__name__ == 'Journald':
|
|
print(line)
|
|
else:
|
|
self.print_formatted(line, args.verbose)
|