diff --git a/configure.ac b/configure.ac index 3e0f8aa..de621b3 100644 --- a/configure.ac +++ b/configure.ac @@ -674,9 +674,9 @@ AC_SUBST(PACKAGE_BASE_VERSION) # set sasl_path for wrapper scripts if test -z "$sasl_libdir" ; then - sasl_path="$libdir/sasl2" + sasl_path="$libdir/sasl2-3" else - sasl_path="$sasl_libdir/sasl2" + sasl_path="$sasl_libdir/sasl2-3" fi AM_CONDITIONAL(SELINUX,test "$with_selinux" = "yes") diff --git a/ldap/servers/slapd/ldaputil.c b/ldap/servers/slapd/ldaputil.c index 45a7dac..8738c3d 100644 --- a/ldap/servers/slapd/ldaputil.c +++ b/ldap/servers/slapd/ldaputil.c @@ -976,18 +976,18 @@ ldaputil_get_saslpath() char *saslpath = getenv("SASL_PATH"); if (NULL == saslpath) { #if defined(LINUX) && defined(__LP64__) - saslpath = "/usr/lib64/sasl2"; + saslpath = "/usr/lib64/sasl2-3"; if (PR_SUCCESS != PR_Access(saslpath, PR_ACCESS_EXISTS)) { #ifdef CPU_arm /* the 64-bit ARMv8 architecture. */ - saslpath = "/usr/lib/aarch64-linux-gnu"; + saslpath = "/usr/lib64/aarch64-linux-gnu"; #else /* Try x86_64 gnu triplet */ saslpath = "/usr/lib/x86_64-linux-gnu"; #endif } #else - saslpath = "/usr/lib/sasl2"; + saslpath = "/usr/lib/sasl2-3"; if (PR_SUCCESS != PR_Access(saslpath, PR_ACCESS_EXISTS)) { #ifdef CPU_arm /* the latest 32 bit ARM architecture using the hard-float version of EABI. */