aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mfdbtool.c11
-rw-r--r--src/srvcfg.c5
2 files changed, 11 insertions, 5 deletions
diff --git a/src/mfdbtool.c b/src/mfdbtool.c
index 1571526e..db6bc18c 100644
--- a/src/mfdbtool.c
+++ b/src/mfdbtool.c
@@ -28,6 +28,7 @@
#include "libmf.h"
#include "mfdb.h"
+#include "filenames.h"
char *state_dir = DEFAULT_STATE_DIR;
char *file_option; /* File name for DB management commands */
@@ -140,7 +141,6 @@ db_proc_enumerator(struct db_format *fmt, void *data)
void
mfdbtool_expire(int argc, char **argv)
{
- /*FIXME: priv_setup(); */
if (all_option)
db_format_enumerate(db_proc_enumerator, db_expire);
else {
@@ -155,7 +155,6 @@ mfdbtool_expire(int argc, char **argv)
void
mfdbtool_compact(int argc, char **argv)
{
- /* FIXME: priv_setup(); */
if (all_option)
db_format_enumerate(db_proc_enumerator, db_compact);
else {
@@ -306,6 +305,10 @@ struct mu_cfg_param mfdbtool_cfg_param[] = {
N_("Default database type"),
N_("type") },
{ "database", mu_cfg_section, NULL, 0, NULL, NULL },
+ { "database-mode", mu_cfg_callback,
+ &mf_database_mode, 0, cb_database_mode,
+ N_("Configure file mode for database files"),
+ N_("mode: octal") },
{ "state-directory", mu_c_string, &state_dir, 0, NULL,
N_("Set program state directory."),
N_("dir") },
@@ -359,9 +362,7 @@ main(int argc, char **argv)
db_format_setup();
database_cfg_init();
- mf_getopt(&cli, &argc, &argv, capa, 0,
- /* FIXME: Use mailfromd.conf somehow? */
- SYSCONFDIR "/mfdbtool.conf");
+ mf_getopt(&cli, &argc, &argv, capa, 0, DEFAULT_CONFIG_FILE);
if (db_type_str) {
mu_url_t dbhint;
diff --git a/src/srvcfg.c b/src/srvcfg.c
index 1f39921a..57388122 100644
--- a/src/srvcfg.c
+++ b/src/srvcfg.c
@@ -30,6 +30,7 @@
#include "srvman.h"
#include "gacopyz.h"
#include "srvcfg.h"
+#include "mfdb.h"
char *mailfromd_state_dir;
int server_flags = 0;
@@ -523,6 +524,10 @@ static struct mu_cfg_param srv_cfg_param[] = {
N_("Default database type"),
N_("type") },
{ "database", mu_cfg_section, NULL, 0, NULL, NULL },
+ { "database-mode", mu_cfg_callback,
+ &mf_database_mode, 0, cb_database_mode,
+ N_("Configure file mode for database files"),
+ N_("mode: octal") },
{ "ehlo-domain", mu_c_string, &ehlo_domain, 0, NULL,
N_("Set the domain name for EHLO command.") },
{ "mail-from-address", mu_c_string, &mailfrom_address, 0, NULL,

Return to:

Send suggestions and report system problems to the System administrator.