From: Howard Chu <hyc@openldap.org>
Date: Thu, 6 Oct 2022 14:31:44 +0000 (+0100)
Subject: ITS#9926 drop symlinks from homedir testdata
X-Git-Tag: OPENLDAP_REL_ENG_2_6_4~73
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9ebe27edfe84973aa06a3ff6abf80febd591b998;p=thirdparty%2Fopenldap.git

ITS#9926 drop symlinks from homedir testdata

Create them when running the test script instead.
---

diff --git a/tests/data/homedir/skel/directory/broken link b/tests/data/homedir/skel/directory/broken link
deleted file mode 120000
index 78bc33729b..0000000000
--- a/tests/data/homedir/skel/directory/broken link	
+++ /dev/null
@@ -1 +0,0 @@
-../target
\ No newline at end of file
diff --git a/tests/data/homedir/skel/symlink b/tests/data/homedir/skel/symlink
deleted file mode 120000
index 6d0450cc24..0000000000
--- a/tests/data/homedir/skel/symlink
+++ /dev/null
@@ -1 +0,0 @@
-directory
\ No newline at end of file
diff --git a/tests/data/slapd-homedir.conf b/tests/data/slapd-homedir.conf
index ee7a9ab23d..9c51a532dd 100644
--- a/tests/data/slapd-homedir.conf
+++ b/tests/data/slapd-homedir.conf
@@ -44,7 +44,7 @@ rootpw		secret
 overlay homedir
 
 homedir-min-uidnumber @MINUID@
-homedir-skeleton-path @DATADIR@/homedir/skel
+homedir-skeleton-path @TESTDIR@/skel
 homedir-regexp ^(/home/[-_/a-z0-9]+)$ @TESTDIR@/$1
 homedir-delete-style ARCHIVE
 homedir-archive-path @TESTDIR@/archive
diff --git a/tests/scripts/test085-homedir b/tests/scripts/test085-homedir
index 8685b91669..5c9ce2466f 100755
--- a/tests/scripts/test085-homedir
+++ b/tests/scripts/test085-homedir
@@ -23,6 +23,10 @@ fi
 
 mkdir -p $TESTDIR $DBDIR1 $TESTDIR/home $TESTDIR/archive
 
+# copy skel dir so we can create symlinks in it
+cp -r $DATADIR/homedir/skel $TESTDIR
+(cd $TESTDIR/skel; ln -s directory symlink; cd directory; ln -s ../target "broken link")
+
 $SLAPPASSWD -g -n >$CONFIGPWF
 echo "rootpw `$SLAPPASSWD -T $CONFIGPWF`" >$TESTDIR/configpw.conf