fix-saslpath

Gbp-Pq: Name fix-saslpath.diff

diff --git a/ldap/servers/slapd/ldaputil.c b/ldap/servers/slapd/ldaputil.c
index 45a7dac3cc90793dfa22d4c05816810df20d0648..811dcdf42876d908193195b4360e368237777c0f 100644 (file)
--- a/ldap/servers/slapd/ldaputil.c
+++ b/ldap/servers/slapd/ldaputil.c
@@ -980,10 +980,10 @@ 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";
 #else
             /* Try x86_64 gnu triplet */
-            saslpath = "/usr/lib/x86_64-linux-gnu";
+            saslpath = "/usr/lib/x86_64-linux-gnu/sasl2";
 #endif
         }
 #else
@@ -991,14 +991,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