kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix sssd startup following libldb changes

Browse source 
PR:		239022
Submitted by:	patrik@hildingsson.se
Approved by:	lukas.slebodnik@intrak.sk (maintainer timeout)
MFH:	2020Q3
This commit is contained in:
Ganael LAPLANCHE 2020-08-19 07:40:59 +00:00
parent d47fa619ed
commit bfcb4eb282
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=545276
2 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
security/sssd/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= sssd
PORTVERSION= 1.11.7
PORTREVISION= 21
PORTREVISION= 22
CATEGORIES= security
MASTER_SITES= https://releases.pagure.org/SSSD/${PORTNAME}/

26
security/sssd/files/patch-src-monitor-monitor.c Normal file
View file

@ -0,0 +1,26 @@
Backport a887e33fbd from upstream:
MONITOR: Do not use two configuration databases
--- src/monitor/monitor.c.orig 2014-09-17 13:01:37 UTC
+++ src/monitor/monitor.c
@@ -2832,6 +2832,20 @@ int main(int argc, const char *argv[])
ret = server_setup(MONITOR_NAME, flags, monitor->conf_path, &main_ctx);
if (ret != EOK) return 2;
+ /* Use confd initialized in server_setup. ldb_tdb module (1.4.0) check PID
+ * of process which initialized db for locking purposes.
+ * Failed to unlock db: ../ldb_tdb/ldb_tdb.c:147:
+ * Reusing ldb opened by pid 28889 in process 28893
+ */
+ talloc_zfree(monitor->cdb);
+ monitor->cdb = main_ctx->confdb_ctx;
+
+ ret = confdb_get_domains(monitor->cdb, &monitor->domains);
+ if (ret != EOK) {
+ DEBUG(SSSDBG_FATAL_FAILURE, "No domains configured.\n");
+ return 4;
+ }
+
monitor->is_daemon = !opt_interactive;
monitor->parent_pid = main_ctx->parent_pid;
monitor->ev = main_ctx->event_ctx;