Request 453 (accepted)

Overview

Request 453 (accepted)

Fix Kolab bug 2229 by using debian patch

Is the patch really needed for RPM-systems? if not, remove the change to the spec file.

Created by jh23453 about 10 years ago
In state accepted
Open review for Admin
Open review for kolab-developers

Submit 389-ds-base

Submit package home:jh23453:...b:Development / 389-ds-base to package Kolab:Development / 389-ds-base

389-ds-base.spec Changed

fix-sasl-path.diff Added

@@ -0,0 +1,38 @@
+--- 389-ds-base-1.2.11.15/ldap/servers/slapd/ldaputil.c.orig	2012-09-25 18:16:09.000000000 +0200
++++ 389-ds-base-1.2.11.15/ldap/servers/slapd/ldaputil.c	2014-05-08 06:48:04.000000000 +0200
+@@ -682,8 +682,16 @@
+         if (!(pluginpath = getenv("SASL_PATH"))) {
+ #if defined(LINUX) && defined(__LP64__)
+             pluginpath = "/usr/lib64/sasl2";
++            if (PR_SUCCESS != PR_Access(pluginpath, PR_ACCESS_EXISTS)) {
++                /* Since the path does not exist, try gnu triplet. */
++                pluginpath = "/usr/lib/x86_64-linux-gnu/sasl2";
++            }
+ #else
+             pluginpath = "/usr/lib/sasl2";
++            if (PR_SUCCESS != PR_Access(pluginpath, PR_ACCESS_EXISTS)) {
++                /* Since the path does not exist, try gnu triplet. */
++                pluginpath = "/usr/lib/i386-linux-gnu/sasl2";
++            }
+ #endif
+         }
+     }
+--- 389-ds-base-1.2.11.15/ldap/servers/slapd/saslbind.c.orig	2012-09-25 18:16:09.000000000 +0200
++++ 389-ds-base-1.2.11.15/ldap/servers/slapd/saslbind.c	2014-05-08 06:48:04.000000000 +0200
+@@ -530,8 +530,16 @@
+         if (!(pluginpath = getenv("SASL_PATH"))) {
+ #if defined(LINUX) && defined(__LP64__)
+             pluginpath = "/usr/lib64/sasl2";
++            if (PR_SUCCESS != PR_Access(pluginpath, PR_ACCESS_EXISTS)) {
++                /* Since the path does not exist, try gnu triplet. */
++                pluginpath = "/usr/lib/x86_64-linux-gnu/sasl2";
++            }
+ #else
+             pluginpath = "/usr/lib/sasl2";
++            if (PR_SUCCESS != PR_Access(pluginpath, PR_ACCESS_EXISTS)) {
++                /* Since the path does not exist, try gnu triplet. */
++                pluginpath = "/usr/lib/i386-linux-gnu/sasl2";
++            }
+ #endif
+         }
+     }