···1019 </listitem>
1020 <listitem>
1021 <para>
000000001022 The rkt module has been removed, it was archived by upstream.
1023 </para>
1024 </listitem>
···1019 </listitem>
1020 <listitem>
1021 <para>
1022+ The syntax of the PostgreSQL configuration file is now checked at build
1023+ time. If your configuration includes a file inaccessible inside the build
1024+ sandbox, set <varname>services.postgresql.checkConfig</varname> to
1025+ <literal>false</literal>.
1026+ </para>
1027+ </listitem>
1028+ <listitem>
1029+ <para>
1030 The rkt module has been removed, it was archived by upstream.
1031 </para>
1032 </listitem>
···1+diff --git a/privacyidea/lib/resolvers/LDAPIdResolver.py b/privacyidea/lib/resolvers/LDAPIdResolver.py
2+index ae9d87764..cfc609931 100644
3+--- a/privacyidea/lib/resolvers/LDAPIdResolver.py
4++++ b/privacyidea/lib/resolvers/LDAPIdResolver.py
5+@@ -97,11 +97,6 @@
6+ SERVERPOOL_ROUNDS = 2
7+ # The number of seconds a non-responding server is removed from the server pool
8+ SERVERPOOL_SKIP = 30
9+-# The number of seconds that ldap3 waits if no server is left in the pool, before
10+-# starting the next round
11+-pooling_loop_timeout = get_app_config_value("PI_LDAP_POOLING_LOOP_TIMEOUT", 10)
12+-log.info("Setting system wide POOLING_LOOP_TIMEOUT to {0!s}.".format(pooling_loop_timeout))
13+-ldap3.set_config_parameter("POOLING_LOOP_TIMEOUT", pooling_loop_timeout)
14+15+ # 1 sec == 10^9 nano secs == 10^7 * (100 nano secs)
16+ MS_AD_MULTIPLYER = 10 ** 7
17+@@ -314,6 +309,11 @@ def __init__(self):
18+ self.serverpool_rounds = SERVERPOOL_ROUNDS
19+ self.serverpool_skip = SERVERPOOL_SKIP
20+ self.serverpool = None
21++ # The number of seconds that ldap3 waits if no server is left in the pool, before
22++ # starting the next round
23++ pooling_loop_timeout = get_app_config_value("PI_LDAP_POOLING_LOOP_TIMEOUT", 10)
24++ log.info("Setting system wide POOLING_LOOP_TIMEOUT to {0!s}.".format(pooling_loop_timeout))
25++ ldap3.set_config_parameter("POOLING_LOOP_TIMEOUT", pooling_loop_timeout)
26+27+ def checkPass(self, uid, password):
28+ """
···1{ lib, stdenv, fetchurl, perl, libunwind, buildPackages }:
23+# libunwind does not have the supportsHost attribute on darwin, thus
4+# when this package is evaluated it causes an evaluation error
5+assert stdenv.isLinux;
6+7stdenv.mkDerivation rec {
8 pname = "strace";
9 version = "5.11";