From 52d82c5bffcabef9e937076a1e59747048180362 Mon Sep 17 00:00:00 2001 From: Debian FreeIPA Team Date: Tue, 2 Jun 2020 09:33:44 +0100 Subject: [PATCH] fix-saslpath Gbp-Pq: Name fix-saslpath.diff --- configure.ac | 4 +++- ldap/servers/slapd/ldaputil.c | 14 +++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 2fa1b2c..eedfea7 100644 --- a/configure.ac +++ b/configure.ac @@ -662,7 +662,8 @@ case $host in arm-*-linux*) AC_DEFINE([CPU_arm], [], [cpu type arm]) ;; - ppc64le-*-linux*) + powerpc64le-*-linux*) + AC_DEFINE([CPU_powerpc64le], [], [cpu type powerpc64le]) ;; ppc64-*-linux*) ;; @@ -671,6 +672,7 @@ case $host in s390-*-linux*) ;; s390x-*-linux*) + AC_DEFINE([CPU_s390x], [], [cpu type s390x]) ;; esac # some programs use the native thread library directly diff --git a/ldap/servers/slapd/ldaputil.c b/ldap/servers/slapd/ldaputil.c index 336ca39..8d97250 100644 --- a/ldap/servers/slapd/ldaputil.c +++ b/ldap/servers/slapd/ldaputil.c @@ -837,10 +837,14 @@ ldaputil_get_saslpath() 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/lib/aarch64-linux-gnu/sasl2"; +#elif defined(CPU_powerpc64le) + saslpath = "/usr/lib/powerpc64le-linux-gnu/sasl2"; +#elif defined(CPU_s390x) + saslpath = "/usr/lib/s390x-linux-gnu/sasl2"; #else /* Try x86_64 gnu triplet */ - saslpath = "/usr/lib/x86_64-linux-gnu"; + saslpath = "/usr/lib/x86_64-linux-gnu/sasl2"; #endif } #else @@ -848,14 +852,14 @@ ldaputil_get_saslpath() 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. */ - saslpath = "/usr/lib/arm-linux-gnueabihf"; + saslpath = "/usr/lib/arm-linux-gnueabihf/sasl2"; if (PR_SUCCESS != PR_Access(saslpath, PR_ACCESS_EXISTS)) { /* the 32 bit ARM architecture of EABI. */ - saslpath = "/usr/lib/arm-linux-gnueabi"; + saslpath = "/usr/lib/arm-linux-gnueabi/sasl2"; } #else /* Try i386 gnu triplet */ - saslpath = "/usr/lib/i386-linux-gnu"; + saslpath = "/usr/lib/i386-linux-gnu/sasl2"; #endif } #endif -- 2.30.2