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/log.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/log.c')
| -rw-r--r-- | ldap/servers/slapd/log.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ldap/servers/slapd/log.c b/ldap/servers/slapd/log.c index 664c6d83..2138d36b 100644 --- a/ldap/servers/slapd/log.c +++ b/ldap/servers/slapd/log.c @@ -225,7 +225,8 @@ void g_log_init(int log_enabled) { slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); #if defined( XP_WIN32 ) - char * instancedir = NULL; + /* char * instancedir = NULL; obsolete. */ + /* To port to Windows, need to support FHS. */ #endif ts_time_lock = PR_NewLock(); @@ -234,7 +235,7 @@ void g_log_init(int log_enabled) #if defined( XP_WIN32 ) pszServerName = slapi_ch_malloc( MAX_SERVICE_NAME ); - instancedir = config_get_instancedir(); + /* instancedir = config_get_instancedir(); eliminated */ unixtodospath(instancedir); if( !SlapdGetServerNameFromCmdline(pszServerName, instancedir, 1) ) { @@ -1578,14 +1579,14 @@ log_write_title (LOGFD fp) PR_snprintf(buff, bufflen, "\t%s:%d (%s)\n\n", fe_cfg->localhost, fe_cfg->security ? fe_cfg->secureport : fe_cfg->port, - fe_cfg->instancedir ? fe_cfg->instancedir : ""); + fe_cfg->configdir ? fe_cfg->configdir : ""); } else { /* If fe_cfg->localhost is not set, ignore fe_cfg->port since * it is the default and might be misleading. */ PR_snprintf(buff, bufflen, "\t<host>:<port> (%s)\n\n", - fe_cfg->instancedir ? fe_cfg->instancedir : ""); + fe_cfg->configdir ? fe_cfg->configdir : ""); } LOG_WRITE_NOW(fp, buff, strlen(buff), 0); slapi_ch_free((void **)&buildnum); |