Attachment 151628 Details for Bug 235143 – CVS Diffs

[patch] CVS Diffs

diffs.txt (text/plain), 1.40 KB, created by Nathan Kinder on 2007-04-03 22:29:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2007-04-03 22:29:35 UTC

Size: 1.40 KB

patch

obsolete

>Index: admin/src/create_instance.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
>retrieving revision 1.52
>diff -u -5 -t -r1.52 create_instance.c
>--- admin/src/create_instance.c	30 Mar 2007 18:12:30 -0000	1.52
>+++ admin/src/create_instance.c	3 Apr 2007 16:00:19 -0000
>@@ -4316,11 +4316,11 @@
>  * cf->db_dir: <localstatedir>/lib/PACKAGE_NAME/slapd-<servid>/db
>  * cf->bak_dir: <localstatedir>/lib/PACKAGE_NAME/slapd-<servid>/bak
>  * 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: 
>  *    If prefix is given, all the other paths start from prefix.
>  *    NETSITE_ROOT is treated as a secondary prefix.  (If prefix is also set,
>@@ -4377,11 +4377,11 @@
> #if !defined( LINUX )
>     /* if not linux, we package sasl2 with DS,
>        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);
> 
>     if (!(cf->servname = ds_a_get_cgi_var("servname", "Server Name",

Actions: View | Diff

Attachments on bug 235143: 151628