From 2a1a22dffe7ad00f76015c2d903809197d0b81b0 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 16 Dec 2020 16:51:46 +0100
Subject: [PATCH] [ticket/16659] Adjust slapd setup for apparmor configuration

PHPBB3-16659
---
 .github/workflows/tests.yml | 2 +-
 travis/ldap/slapd.conf      | 6 +++---
 travis/setup-ldap.sh        | 7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 210203e640..88ac480518 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -142,7 +142,7 @@ jobs:
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv
+                  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
                   coverage: none
 
             - name: Setup environment for phpBB
diff --git a/travis/ldap/slapd.conf b/travis/ldap/slapd.conf
index 5fce95cee2..9f6aa980f7 100644
--- a/travis/ldap/slapd.conf
+++ b/travis/ldap/slapd.conf
@@ -4,13 +4,13 @@ include   /etc/ldap/schema/cosine.schema
 include   /etc/ldap/schema/inetorgperson.schema
 include   /etc/ldap/schema/nis.schema
 
-pidfile         /tmp/slapd/slapd.pid
-argsfile        /tmp/slapd/slapd.args
+pidfile         /var/tmp/slapd/slapd.pid
+argsfile        /var/tmp/slapd/slapd.args
 
 modulepath     /usr/lib/openldap
 
 database  ldif
-directory /tmp/slapd
+directory /var/tmp/slapd
 
 suffix    "dc=example,dc=com"
 rootdn    "cn=admin,dc=example,dc=com"
diff --git a/travis/setup-ldap.sh b/travis/setup-ldap.sh
index 9be816d77d..a5cbd3c0e1 100755
--- a/travis/setup-ldap.sh
+++ b/travis/setup-ldap.sh
@@ -15,9 +15,10 @@ SLOWTESTS=$1
 
 if [ "$SLOWTESTS" == '1' ]
 then
-	sudo apt-get -y install ldap-utils slapd php-ldap
-	mkdir /tmp/slapd
-	slapd -f travis/ldap/slapd.conf -h ldap://localhost:3389 &
+	sudo apt-get -y install ldap-utils slapd
+	mkdir /var/tmp/slapd
+	cp travis/ldap/slapd.conf /var/tmp/slapd/slapd.conf
+	slapd -d 256 -d 128 -f /var/tmp/slapd/slapd.conf -h ldap://localhost:3389 &
 	sleep 3
 	ldapadd -h localhost:3389 -D "cn=admin,dc=example,dc=com" -w adminadmin -f travis/ldap/base.ldif
 fi