diff options
| author | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2020-08-19 09:21:08 +0000 |
|---|---|---|
| committer | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2020-08-19 09:21:08 +0000 |
| commit | ad176ca4ac93c7553ba142ce43477c123a9c56bc (patch) | |
| tree | 824473c1ea0cea4d3a0564fc4c69d2e75e658f66 /security | |
| parent | 7e200874af68b51563e94f3d308b541e8c3b01ad (diff) | |
| download | ports-ad176ca4ac93c7553ba142ce43477c123a9c56bc.tar.gz ports-ad176ca4ac93c7553ba142ce43477c123a9c56bc.zip | |
MFH: r545276
Fix sssd startup following libldb changes
PR: 239022
Submitted by: patrik@hildingsson.se
Approved by: lukas.slebodnik@intrak.sk (maintainer timeout)
Approved by: ports-secteam (joneum)
Notes
Notes:
svn path=/branches/2020Q3/; revision=545293
Diffstat (limited to 'security')
| -rw-r--r-- | security/sssd/Makefile | 2 | ||||
| -rw-r--r-- | security/sssd/files/patch-src-monitor-monitor.c | 26 |
2 files changed, 27 insertions, 1 deletions
diff --git a/security/sssd/Makefile b/security/sssd/Makefile index 319798e565c2..21650d29a78a 100644 --- a/security/sssd/Makefile +++ b/security/sssd/Makefile @@ -3,7 +3,7 @@ PORTNAME= sssd PORTVERSION= 1.11.7 -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= security MASTER_SITES= https://releases.pagure.org/SSSD/${PORTNAME}/ diff --git a/security/sssd/files/patch-src-monitor-monitor.c b/security/sssd/files/patch-src-monitor-monitor.c new file mode 100644 index 000000000000..f006fe777692 --- /dev/null +++ b/security/sssd/files/patch-src-monitor-monitor.c @@ -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; |