Author: nkinder

Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17061

Modified Files: create_instance.c Log Message: Resolves: 235143 Summary: Set correct default nsslapd-saslpath config setting on non-Linux platforms.

Index: create_instance.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- create_instance.c 30 Mar 2007 18:12:30 -0000 1.52 +++ create_instance.c 3 Apr 2007 23:07:43 -0000 1.53 @@ -4318,7 +4318,7 @@ * 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 @@ 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);