[Fedora-directory-commits] ldapserver/ldap/servers/slapd saslbind.c, 1.27, 1.28

[Nathan Kinder]

Author: nkinder

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31500/ldap/servers/slapd

Modified Files:
	saslbind.c 
Log Message:
Resolves: 452569
Summary: Use 64-bit specific SASL default plug-in path on 64-bit Linux machines.



Index: saslbind.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/saslbind.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- saslbind.c	8 Oct 2008 17:29:03 -0000	1.27
+++ saslbind.c	4 Nov 2008 23:21:10 -0000	1.28
@@ -475,12 +475,17 @@
 static int ids_sasl_getpluginpath(sasl_conn_t *conn, const char **path)
 {
     /* Try to get path from config, otherwise check for SASL_PATH environment
-     * variable.  If neither of these are set, just default to /usr/lib/sasl2
+     * variable.  If neither of these are set, default to /usr/lib64/sasl2 on
+     * 64-bit Linux machines, and /usr/lib/sasl2 on all other platforms.
      */
     char *pluginpath = config_get_saslpath();
     if ((!pluginpath) || (*pluginpath == '\0')) {
         if (!(pluginpath = getenv("SASL_PATH"))) {
-            pluginpath = "/usr/lib64/sasl2:/usr/lib/sasl2";
+#if defined(LINUX) && defined(__LP64__)
+            pluginpath = "/usr/lib64/sasl2";
+#else
+            pluginpath = "/usr/lib/sasl2";
+#endif
         }
     }
     *path = pluginpath;