Skip to content

Commit 6447097

Browse files
committed
tests: Prevent syslog activity by slapd, take 2
Unfortunately it turns out that the logfile-only option added in b9f8d1c is only available in openldap starting in 2.6. Luckily the option to control the log level (loglevel/-s) have been around for much longer. As it turns out loglevel/-s only control what goes into syslog, not what ends up in the file specified with 'logfile' and stderr. While we currently are specifying 'logfile', nothing ends up in it, as the option only controls debug messages, and we didn't set a debug level. The debug level can only be configured on the commandline and also prevents forking. That'd require larger changes, so this commit doesn't tackle that issue. Specify the syslog level when starting slapd using -s, as that allows to prevent all syslog messages if one uses '0' instead of 'none', while loglevel doesn't prevent the first message. Discussion: https://postgr.es/m/20230311233708.3yjdbjkly2q4gq2j@awork3.anarazel.de Backpatch: 11-
1 parent e709596 commit 6447097

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/test/ldap/LdapServer.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ sub new
169169
170170
pidfile $slapd_pidfile
171171
logfile $slapd_logfile
172-
logfile-only on
173172
174173
access to *
175174
by * read
@@ -205,7 +204,8 @@ EOC
205204
append_to_file($ldap_pwfile, $ldap_rootpw);
206205
chmod 0600, $ldap_pwfile or die "chmod on $ldap_pwfile";
207206

208-
system_or_bail $slapd, '-f', $slapd_conf, '-h', "$ldap_url $ldaps_url";
207+
# -s0 prevents log messages ending up in syslog
208+
system_or_bail $slapd, '-f', $slapd_conf, '-s0', '-h', "$ldap_url $ldaps_url";
209209

210210
# wait until slapd accepts requests
211211
my $retries = 0;

0 commit comments

Comments
 (0)