Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10171/ldap/admin/src
Modified Files:
create_instance.c create_instance.h
Log Message:
Resolves: 214238
Summary: Added new config parameter for setting the SASL plug-in path.
Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- create_instance.c 26 Oct 2006 17:45:27 -0000 1.32
+++ create_instance.c 6 Nov 2006 19:33:41 -0000 1.33
@@ -2700,6 +2700,10 @@
fprintf(f, "nsslapd-lockdir: %s\n", cf->lock_dir);
fprintf(f, "nsslapd-tmpdir: %s\n", cf->tmp_dir);
fprintf(f, "nsslapd-certdir: %s\n", cf->cert_dir);
+/* We use the system SASL by default on Linux, so we don't need to set sasl path */
+#if !defined( LINUX )
+ fprintf(f, "nsslapd-saslpath: %s\n", cf->sasl_path);
+#endif
fprintf(f, "nsslapd-accesslog-logging-enabled: on\n");
fprintf(f, "nsslapd-accesslog-maxlogsperdir: 10\n");
fprintf(f, "nsslapd-accesslog-mode: 600\n");
@@ -4293,6 +4297,7 @@
* cf->tmp_dir: <localstatedir>/tmp/slapd-<servid>
* cf->ldif_dir: <datadir>/<brand-ds>/ldif
* cf->cert_dir: <sysconfdir>/BRAND_DS/slapd-<servid>
+ * cf->sasl_path: <sroot>/sasl2
* cf->plugin_dir: <sroot>/plugins
*
* NOTES:
@@ -4342,6 +4347,7 @@
cf->sroot = PR_smprintf("%s%cusr%clib%c%s",
prefix, FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP, cf->brand_ds);
+ cf->sasl_path = PR_smprintf("%s%csasl2", cf->sroot, FILE_PATHSEP);
cf->plugin_dir = PR_smprintf("%s%cplugins", cf->sroot,
FILE_PATHSEP);
if (!(cf->servname = ds_a_get_cgi_var("servname", "Server
Name",
Index: create_instance.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- create_instance.h 25 Oct 2006 00:04:41 -0000 1.9
+++ create_instance.h 6 Nov 2006 19:33:41 -0000 1.10
@@ -136,6 +136,7 @@
char *plugin_dir;
char *tmp_dir;
char *cert_dir;
+ char *sasl_path;
char *prefix;
} server_config_s;
Show replies by date