Date: Wed, 19 Aug 2020 09:21:08 +0000 (UTC) From: Ganael LAPLANCHE <martymac@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r545293 - in branches/2020Q3/security/sssd: . files Message-ID: <202008190921.07J9L8fr006189@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: martymac Date: Wed Aug 19 09:21:08 2020 New Revision: 545293 URL: https://svnweb.freebsd.org/changeset/ports/545293 Log: 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) Added: branches/2020Q3/security/sssd/files/patch-src-monitor-monitor.c - copied unchanged from r545276, head/security/sssd/files/patch-src-monitor-monitor.c Modified: branches/2020Q3/security/sssd/Makefile Directory Properties: branches/2020Q3/ (props changed) Modified: branches/2020Q3/security/sssd/Makefile ============================================================================== --- branches/2020Q3/security/sssd/Makefile Wed Aug 19 08:55:36 2020 (r545292) +++ branches/2020Q3/security/sssd/Makefile Wed Aug 19 09:21:08 2020 (r545293) @@ -3,7 +3,7 @@ PORTNAME= sssd PORTVERSION= 1.11.7 -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= security MASTER_SITES= https://releases.pagure.org/SSSD/${PORTNAME}/ Copied: branches/2020Q3/security/sssd/files/patch-src-monitor-monitor.c (from r545276, head/security/sssd/files/patch-src-monitor-monitor.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/security/sssd/files/patch-src-monitor-monitor.c Wed Aug 19 09:21:08 2020 (r545293, copy of r545276, head/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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008190921.07J9L8fr006189>