diff options
| author | Nathan Kinder <nkinder@redhat.com> | 2006-11-07 04:42:55 +0000 |
|---|---|---|
| committer | Nathan Kinder <nkinder@redhat.com> | 2006-11-07 04:42:55 +0000 |
| commit | 22ad5a9a938cf0698f8a2e096ff863670c4d03af (patch) | |
| tree | ff44141dfd7841e491de97a6c050be73f0433514 /ldap/servers/slapd/saslbind.c | |
| parent | 6b0713023b625336b49d3c6daeac16c4a6388f43 (diff) | |
| download | ds-22ad5a9a938cf0698f8a2e096ff863670c4d03af.tar.gz ds-22ad5a9a938cf0698f8a2e096ff863670c4d03af.tar.xz ds-22ad5a9a938cf0698f8a2e096ff863670c4d03af.zip | |
Related: 214238
Summary: Make fallback SASL path work for 64-bit Linux default location.
Diffstat (limited to 'ldap/servers/slapd/saslbind.c')
| -rw-r--r-- | ldap/servers/slapd/saslbind.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ldap/servers/slapd/saslbind.c b/ldap/servers/slapd/saslbind.c index 1c91fe92..8bd1a19c 100644 --- a/ldap/servers/slapd/saslbind.c +++ b/ldap/servers/slapd/saslbind.c @@ -560,7 +560,7 @@ static int ids_sasl_getpluginpath(sasl_conn_t *conn, const char **path) char *pluginpath = config_get_saslpath(); if ((!pluginpath) || (*pluginpath == '\0')) { if (!(pluginpath = getenv("SASL_PATH"))) { - pluginpath = "/usr/lib/sasl2"; + pluginpath = "/usr/lib64/sasl2:/usr/lib/sasl2"; } } *path = pluginpath; @@ -744,7 +744,7 @@ char **ids_sasl_listmech(Slapi_PBlock *pb) LDAPDebug(LDAP_DEBUG_TRACE, "sasl library mechs: %s\n", str, 0, 0); /* merge into result set */ dupstr = slapi_ch_strdup(str); - others = str2charray(dupstr, ","); + others = str2charray_ext(dupstr, ",", 0 /* don't list duplicate mechanisms */); charray_merge(&ret, others, 1); charray_free(others); slapi_ch_free((void**)&dupstr); |