40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
|
From e006994d83af9dcb7813a18253cf4e5beacee043 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ryan Tandy <ryan@nardis.ca>
|
||
|
|
Date: Sun, 26 Apr 2020 11:40:23 -0700
|
||
|
|
Subject: [PATCH] Fix slaptest in test077
|
||
|
|
|
||
|
|
The libtool wrapper scripts lose argv[0] when exec'ing the real binary.
|
||
|
|
|
||
|
|
In the CI Docker container, where the build runs as root, this was
|
||
|
|
actually starting a real slapd on the default port.
|
||
|
|
|
||
|
|
Outside Docker, running as a non-root user, this slapd would just fail
|
||
|
|
to start, and wouldn't convert the config either.
|
||
|
|
|
||
|
|
Using "slapd -Tt" fixes the issue but also prints a warning from
|
||
|
|
slaptest since the database hasn't been initialized yet.
|
||
|
|
|
||
|
|
Dynamic config isn't actually used in this test script, so let's just
|
||
|
|
run slapd off the config file directly.
|
||
|
|
---
|
||
|
|
tests/scripts/test077-sasl-gssapi | 3 ---
|
||
|
|
1 file changed, 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tests/scripts/test077-sasl-gssapi b/tests/scripts/test077-sasl-gssapi
|
||
|
|
index 64abe16fe..bde9006ca 100755
|
||
|
|
--- a/tests/scripts/test077-sasl-gssapi
|
||
|
|
+++ b/tests/scripts/test077-sasl-gssapi
|
||
|
|
@@ -24,9 +24,6 @@ fi
|
||
|
|
mkdir -p $TESTDIR $DBDIR1
|
||
|
|
cp -r $DATADIR/tls $TESTDIR
|
||
|
|
|
||
|
|
-cd $TESTWD
|
||
|
|
-
|
||
|
|
-
|
||
|
|
echo "Starting KDC for SASL/GSSAPI tests..."
|
||
|
|
. $SRCDIR/scripts/setup_kdc.sh
|
||
|
|
|
||
|
|
--
|
||
|
|
2.29.2
|
||
|
|
|