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