diff options
author | Noriko Hosoi <nhosoi@redhat.com> | 2006-10-13 01:06:29 +0000 |
---|---|---|
committer | Noriko Hosoi <nhosoi@redhat.com> | 2006-10-13 01:06:29 +0000 |
commit | 57e9577e0e96da39c62cc0b2c3ae3c053ff9232f (patch) | |
tree | 9c276cb9c3f35cec42e4c63c24fcba21f25b929e /ldap/servers/slapd/main.c | |
parent | 65dd96fe4a1effd42dfecaebd58c384ba7624518 (diff) | |
download | ds-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/slapd/main.c')
-rw-r--r-- | ldap/servers/slapd/main.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/ldap/servers/slapd/main.c b/ldap/servers/slapd/main.c index 514ce88d..d74d6fd9 100644 --- a/ldap/servers/slapd/main.c +++ b/ldap/servers/slapd/main.c @@ -274,13 +274,7 @@ fix_ownership() else { return; } - - /* The instance directory needs to be owned by the local user */ - if (slapdFrontendConfig->instancedir) { - slapd_chown_if_not_owner(slapdFrontendConfig->instancedir, - pw->pw_uid, -1); - } - /* config directory */ + /* config directory needs to be owned by the local user */ if (slapdFrontendConfig->configdir) { chown_dir_files(slapdFrontendConfig->configdir, pw, PR_FALSE); } @@ -698,8 +692,7 @@ main( int argc, char **argv) process_command_line(argc,argv,myname,&extraname); - if (!slapdFrontendConfig->instancedir && - !slapdFrontendConfig->configdir) { + if (NULL == slapdFrontendConfig->configdir) { usage( myname, extraname ); exit( 1 ); } |