From e6a9937c49db559f5bfc1e8e9acfd7f925805c3e Mon Sep 17 00:00:00 2001 From: Sergey Skvortsov Date: Tue, 30 Sep 2008 15:38:53 +0000 Subject: [PATCH] Fix support of multiple database backend definitions. PR: ports/127245 Submitted by: Alexander Kriventsov Approved by: maintainer timeout --- net/openldap24-server/Makefile | 2 +- net/openldap24-server/files/slapd.sh.in | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index 2a2661b74746..7749da8361d3 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -39,7 +39,7 @@ BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER} .endif PORTREVISION_CLIENT= 0 -PORTREVISION_SERVER= 1 +PORTREVISION_SERVER= 2 .if !defined(CLIENT_ONLY) OPTIONS= SASL "With (Cyrus) SASL2 support" off \ diff --git a/net/openldap24-server/files/slapd.sh.in b/net/openldap24-server/files/slapd.sh.in index 70b5106de23a..1af8eee71a5f 100644 --- a/net/openldap24-server/files/slapd.sh.in +++ b/net/openldap24-server/files/slapd.sh.in @@ -39,7 +39,7 @@ start_postcmd=start_postcmd # extract user and group, adjust ownership of directories and database -DBDIR=`awk '$1 == "directory" {print $2}' "%%PREFIX%%/etc/openldap/slapd.conf"` +DATABASEDIR=`awk '$1 == "directory" {print $2}' "%%PREFIX%%/etc/openldap/slapd.conf"` start_precmd() { @@ -49,13 +49,16 @@ start_precmd() ""|[Nn][Oo][Nn][Ee]|[Dd][Ee][Ff][Aa][Uu][Ll][Tt]) ;; *) - if [ ! -d "${DBDIR}" ]; then - mkdir -p "${DBDIR}" - cp "%%PREFIX%%/etc/openldap/DB_CONFIG.example" "${DBDIR}/DB_CONFIG" - fi + local DBDIR + for DBDIR in ${DATABASEDIR}; do + if [ ! -d "${DBDIR}" ]; then + mkdir -p "${DBDIR}" + cp "%%PREFIX%%/etc/openldap/DB_CONFIG.example" "${DBDIR}/DB_CONFIG" + fi + chown -RL "$slapd_owner" "${DBDIR}" + chmod 700 "${DBDIR}" + done chown "$slapd_owner" "%%LDAP_RUN_DIR%%" - chown -RL "$slapd_owner" "${DBDIR}" - chmod 700 "${DBDIR}" chown "$slapd_owner" "%%PREFIX%%/etc/openldap/slapd.conf" slapd_ownername="${slapd_owner%:*}"