calloutd: implement the --resolv-conf-file option

1 files changed, 15 insertions, 2 deletions

diff --git a/src/calloutd.c b/src/calloutd.c
index 56dd2a44..1f25649c 100644
--- a/src/calloutd.c
+++ b/src/calloutd.c
@@ -45,23 +45,24 @@ callout_alloc_die()
         abort();
 }
 
 const char *program_version = "calloutd (" PACKAGE_STRING ")";
 static char prog_doc[] = N_("calloutd -- a call out server");
 
+static char *resolv_conf_file;
+
 struct mu_cfg_param callout_cfg_param[] = {
  	{ ".mfd:server",  mu_cfg_section, NULL, 0, NULL, NULL },
         { "lock-retry-count", mu_cfg_callback, NULL, 0,
 	  config_cb_lock_retry_count,
 	  N_("Retry acquiring DBM file lock this number of times."),
           N_("arg: number") },
 	{ "lock-retry-timeout", mu_cfg_callback, NULL, 0,
 	  config_cb_lock_retry_timeout,
 	  N_("Set the time span between the two DBM locking attempts."),
-	  N_("time: interval") },
-	
+	  N_("time: interval") },	
 	{ NULL }
 };
 
 
 
 extern char **environ;
@@ -78,13 +79,22 @@ int
 mf_server_function(const char *key, struct mf_srvcfg *cfg)
 {
 	cfg->server = callout_session_server;
 	return 0;
 }
 
+static struct mu_option calloutd_options[] = {
+	MU_OPTION_GROUP(N_("General options")),
+	{ "resolv-conf-file", 0, N_("FILE"), MU_OPTION_DEFAULT,
+	  N_("read resolver configuration from FILE"),
+	  mu_c_string, &resolv_conf_file },
+	MU_OPTION_END
+}, *options[] = { calloutd_options, NULL };
+	
 struct mu_cli_setup cli = {
+	.optv = options,
 	.cfg = callout_cfg_param,
 	.prog_doc = prog_doc,
 };
 
 int
 main(int argc, char **argv)
@@ -105,12 +115,15 @@ main(int argc, char **argv)
 	database_cfg_init();
 	mu_acl_cfg_init();
 	srvman_init();
 	mf_srvcfg_init(argv[0], NULL);
 	mf_getopt(&cli, &argc, &argv, capa, MF_GETOPT_DEFAULT);
 
+	if (resolv_conf_file)
+		dnsbase_file_init(resolv_conf_file);
+
 	mf_srvcfg_flush();
 
 	mf_server_lint_option = "--config-lint";
 	mf_server_start("calloutd", mailfromd_state_dir, pidfile,
 			server_flags);
 	exit(0);