summaryrefslogtreecommitdiffstats
path: root/ldap/admin/lib/dsalib_updown.c
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2007-01-26 20:00:45 +0000
committerRich Megginson <rmeggins@redhat.com>2007-01-26 20:00:45 +0000
commitea6e70f88331defc7c37afa624c9ee047d8c3968 (patch)
tree396dd7d6d7dd49f4a67343d4bc501310476de2c0 /ldap/admin/lib/dsalib_updown.c
parent8fc67410fd491c72e5b52a7e0f2d49b5c721e896 (diff)
downloadds-ea6e70f88331defc7c37afa624c9ee047d8c3968.tar.gz
ds-ea6e70f88331defc7c37afa624c9ee047d8c3968.tar.xz
ds-ea6e70f88331defc7c37afa624c9ee047d8c3968.zip
Resolves: bug 224606
Bug Description: Instance specific dirs should be in instance directory Reviewed by: nhosoi (Thanks!) Fix Description: Fixed create instance to create these instance specific directories: /var/lock/slapd-instance -> /var/lock/fedora-ds/slapd-instance /var/lib/slapd-instance -> /var/lib/fedora-ds/slapd-instance /var/log/slapd-instance -> /var/log/fedora-ds/slapd-instance /var/run/slapd-instance -> /var/run/fedora-ds For now, I'm side-stepping the question of what to do about permissions on /var/run/fedora-ds/slapd-instance.pid - we'll address this in the RPM creation. I've also moved the migration scripts to the %{_libdir}/fedora-ds/slapd-instance directory, and I've made the default directory for the key/cert db the same as the config directory. I think the dynamic nature of their configuration warrants the move. Platforms tested: RHEL4 Flag Day: no Doc impact: no
Diffstat (limited to 'ldap/admin/lib/dsalib_updown.c')
-rw-r--r--ldap/admin/lib/dsalib_updown.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ldap/admin/lib/dsalib_updown.c b/ldap/admin/lib/dsalib_updown.c
index a1f5fcd5..f2f89ef0 100644
--- a/ldap/admin/lib/dsalib_updown.c
+++ b/ldap/admin/lib/dsalib_updown.c
@@ -95,7 +95,7 @@ ds_get_updown_status()
fprintf(stderr, "ds_get_updown_status: could not get install root\n");
return(DS_SERVER_UNKNOWN);
}
- PR_snprintf(pid_file_name, BIG_LINE, "%s/pid", rundir);
+ PR_snprintf(pid_file_name, BIG_LINE, "%s/%s.pid", ds_get_server_name(), rundir);
pidfile = fopen(pid_file_name, "r");
if ( pidfile == NULL ) {
/*