diff options
| author | Nathan Kinder <nkinder@redhat.com> | 2006-11-06 19:33:42 +0000 |
|---|---|---|
| committer | Nathan Kinder <nkinder@redhat.com> | 2006-11-06 19:33:42 +0000 |
| commit | 6f4bf3ed01dd5b7fba4e603b0c3f495c766d64ba (patch) | |
| tree | 0788cf5db0b63684b83631f55e91e8daa48d1da6 /ldap/admin/src | |
| parent | cd00618c33892c16160395fea526aa86e2ffc3c4 (diff) | |
| download | ds-6f4bf3ed01dd5b7fba4e603b0c3f495c766d64ba.tar.gz ds-6f4bf3ed01dd5b7fba4e603b0c3f495c766d64ba.tar.xz ds-6f4bf3ed01dd5b7fba4e603b0c3f495c766d64ba.zip | |
Resolves: 214238
Summary: Added new config parameter for setting the SASL plug-in path.
Diffstat (limited to 'ldap/admin/src')
| -rw-r--r-- | ldap/admin/src/create_instance.c | 6 | ||||
| -rw-r--r-- | ldap/admin/src/create_instance.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/ldap/admin/src/create_instance.c b/ldap/admin/src/create_instance.c index 21bfad80..17407a9b 100644 --- a/ldap/admin/src/create_instance.c +++ b/ldap/admin/src/create_instance.c @@ -2700,6 +2700,10 @@ char *ds_gen_confs(char *sroot, server_config_s *cf, char *cs_path) 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 @@ set_path_attribute(char *attr, char *defaultval, char *prefix) * 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 @@ int parse_form(server_config_s *cf) 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", diff --git a/ldap/admin/src/create_instance.h b/ldap/admin/src/create_instance.h index 4178c1cb..c63f1a87 100644 --- a/ldap/admin/src/create_instance.h +++ b/ldap/admin/src/create_instance.h @@ -136,6 +136,7 @@ typedef struct { char *plugin_dir; char *tmp_dir; char *cert_dir; + char *sasl_path; char *prefix; } server_config_s; |