]> git.ipfire.org Git - thirdparty/HylaFAX.git/commitdiff
faxmail: Read faxmail.conf in the delivery part too
authorAidan Van Dyk <aidan@ifax.com>
Tue, 8 May 2007 20:38:42 +0000 (20:38 +0000)
committerAidan Van Dyk <aidan@ifax.com>
Tue, 8 May 2007 20:38:42 +0000 (20:38 +0000)
This way faxmail.conf can set "delivery" type options that can override
sendfax.conf options.  It used to only be able to get formatting/handling
options from faxmail.conf because the "SendFaxClient" class only read
sendfax.conf (along with the other SYSCONF and USERCONF files).

faxmail/faxmail.c++

index 15b1933a131782246b24dc0efa210af3e0dd2b4f..96d0d83f1191c21e3ab1800933e00c5d60f51e2f 100644 (file)
@@ -56,7 +56,7 @@ MySendFaxClient::setup(bool b)
     resetConfig();
     readConfig(FAX_SYSCONF);
     readConfig(FAX_LIBDATA "/sendfax.conf");
-    // XXX should we read faxmail.conf also??
+    readConfig(FAX_LIBDATA "/faxmail.conf");
     readConfig(FAX_USERCONF);
     setVerbose(b);
     FaxClient::setVerbose(b);