diff options
| author | Nathan Kinder <nkinder@redhat.com> | 2008-11-04 23:21:10 +0000 |
|---|---|---|
| committer | Nathan Kinder <nkinder@redhat.com> | 2008-11-04 23:21:10 +0000 |
| commit | b16db5f60e66a8f71b204252dabda9f700718f3f (patch) | |
| tree | 30ac77f9b3b82e8e83e68a288c4e897493c00f1a | |
| parent | 85260faf107bffcb3cfffc4fb06edbf03bb90ea2 (diff) | |
Resolves: 452569
Summary: Use 64-bit specific SASL default plug-in path on 64-bit Linux machines.
| -rw-r--r-- | ldap/servers/slapd/saslbind.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ldap/servers/slapd/saslbind.c b/ldap/servers/slapd/saslbind.c index eabdd042..20e9bc2c 100644 --- a/ldap/servers/slapd/saslbind.c +++ b/ldap/servers/slapd/saslbind.c @@ -475,12 +475,17 @@ static int ids_sasl_canon_user( 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; |