summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Kinder <nkinder@redhat.com>2007-04-03 23:07:43 +0000
committerNathan Kinder <nkinder@redhat.com>2007-04-03 23:07:43 +0000
commitacce69047413286cd93933708c3aa0c15ce1763b (patch)
tree543360dd2f9ced8f4ab2e272e168fb820862b22c
parent14cda45f55b412592df6cc8b7b3724ee6abdbada (diff)
downloadds-acce69047413286cd93933708c3aa0c15ce1763b.tar.gz
ds-acce69047413286cd93933708c3aa0c15ce1763b.tar.xz
ds-acce69047413286cd93933708c3aa0c15ce1763b.zip
Resolves: 235143
Summary: Set correct default nsslapd-saslpath config setting on non-Linux platforms.
-rw-r--r--ldap/admin/src/create_instance.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ldap/admin/src/create_instance.c b/ldap/admin/src/create_instance.c
index 9fa0c72f..bbf2c7f4 100644
--- a/ldap/admin/src/create_instance.c
+++ b/ldap/admin/src/create_instance.c
@@ -4318,7 +4318,7 @@ set_path_attribute(char *attr, char *defaultval, char *prefix)
* cf->tmp_dir: <localstatedir>/tmp/PACKAGE_NAME/slapd-<servid>
* cf->ldif_dir: <datadir>/<brand-ds>/ldif
* cf->cert_dir: <sysconfdir>/PACKAGE_NAME/slapd-<servid>
- * cf->sasl_path: <sroot>/sasl2
+ * cf->sasl_path: %{_libdir}/sasl2
* cf->plugin_dir: <sroot>/plugins
*
* NOTES:
@@ -4379,7 +4379,7 @@ int parse_form(server_config_s *cf)
and always set it in the conf file. */
else
{
- cf->sasl_path = PR_smprintf("%s%csasl2", cf->sroot, FILE_PATHSEP);
+ cf->sasl_path = PR_smprintf("%s%s%csasl2", prefix, LIBDIR, FILE_PATHSEP);
}
#endif
cf->plugin_dir = PR_smprintf("%s%cplugins", cf->sroot, FILE_PATHSEP);