summaryrefslogtreecommitdiffstats
path: root/ldap/servers/plugins/http
diff options
context:
space:
mode:
authorNoriko Hosoi <nhosoi@redhat.com>2006-10-13 01:06:29 +0000
committerNoriko Hosoi <nhosoi@redhat.com>2006-10-13 01:06:29 +0000
commit57e9577e0e96da39c62cc0b2c3ae3c053ff9232f (patch)
tree9c276cb9c3f35cec42e4c63c24fcba21f25b929e /ldap/servers/plugins/http
parent65dd96fe4a1effd42dfecaebd58c384ba7624518 (diff)
downloadds-57e9577e0e96da39c62cc0b2c3ae3c053ff9232f.tar.gz
ds-57e9577e0e96da39c62cc0b2c3ae3c053ff9232f.tar.xz
ds-57e9577e0e96da39c62cc0b2c3ae3c053ff9232f.zip
[208672] parameterizing the hardcoded paths (phase 2. db, log, lock, pid, cert, and instance dir)
1) introduced these 3 new config attributes: nsslapd-lockdir, nsslapd-tmpdir, nsslapd-certdir, and eliminated: nsslapd-instancedir. 2) replaced the hardcoded paths with the corresponding attribute value in the server as well as in the create/remove instance codes. 3) moved snmp stats file to the nsslapd-tmpdir 4) moved the server instance dir to <prefix>/lib/<brand>-ds/slapd-<id>
Diffstat (limited to 'ldap/servers/plugins/http')
-rw-r--r--ldap/servers/plugins/http/http_impl.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/ldap/servers/plugins/http/http_impl.c b/ldap/servers/plugins/http/http_impl.c
index 2dac90a9..ee4f7ab3 100644
--- a/ldap/servers/plugins/http/http_impl.c
+++ b/ldap/servers/plugins/http/http_impl.c
@@ -326,7 +326,7 @@ static int doRequest(const char *url, httpheader **httpheaderArray, char *body,
NSS_Shutdown();
nssFlags &= (~NSS_INIT_READONLY);
- val = config_get_instancedir();
+ val = config_get_certdir();
PL_strncpyz(certDir, val, sizeof(certDir));
defaultprefix = strrchr(certDir, '/');
if (!defaultprefix)
@@ -336,8 +336,6 @@ static int doRequest(const char *url, httpheader **httpheaderArray, char *body,
defaultprefix++;
PR_snprintf(certPref, 1024, "%s-",defaultprefix);
PL_strncpyz(keyPref, certPref, sizeof(keyPref));
- *defaultprefix= '\0';
- PR_snprintf(certDir, 1024, "%salias", certDir);
nssStatus = NSS_Initialize(certDir, certPref, keyPref, "secmod.db", nssFlags);
slapi_ch_free((void **)&val);