diff options
| -rw-r--r-- | net/openldap24-server/Makefile | 2 | ||||
| -rw-r--r-- | net/openldap24-server/files/slapd.sh.in | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index 4190c122be15..6c47ae8bcb61 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= 0 +PORTREVISION_SERVER= 1 .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 341fcaee28d9..9c94268474b0 100644 --- a/net/openldap24-server/files/slapd.sh.in +++ b/net/openldap24-server/files/slapd.sh.in @@ -39,6 +39,8 @@ 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"` + start_precmd() { local slapd_ownername slapd_groupname @@ -48,8 +50,8 @@ start_precmd() ;; *) chown "$slapd_owner" "%%LDAP_RUN_DIR%%" - chown -RL "$slapd_owner" "%%DATABASEDIR%%" - chmod 700 "%%DATABASEDIR%%" + chown -RL "$slapd_owner" "${DBDIR}" + chmod 700 "${DBDIR}" chown "$slapd_owner" "%%PREFIX%%/etc/openldap/slapd.conf" slapd_ownername="${slapd_owner%:*}" |