Switch to libmu_dbm for DBM support.

* configure.ac (DEFAULT_DB_TYPE): New variable.
Use mu info to determine which DBM is supported.
* lib/Makefile.am (noinst_LIBRARIES): Remove libdbm.a
* lib/mf-dbm.c: remove.
* lib/mf-dbm.h: remove.
* lib/cache.c: Use libmu_dbm functions.
* lib/db.c: Likewise.
* lib/dbcfg.c: Likewise.
* lib/greylist.c: Likewise.
* lib/rate.c: Likewise.
* lib/tbf_rate.c: Likewise.
* src/builtin/db.bi: Likewise.
* src/savsrv.c: Likewise.
* src/srvcfg.c (srv_cfg_param) <database-type>: New statement.
* lib/libmf.h (config_cb_ignore): New proto.
* lib/mfdb.h (db_item_printer_t): Change signature.
* lib/utils.c (config_cb_ignore): New function.
* po/POTFILES.in: Update.
* src/Makefile.am (mailfromd_LDADD)
(calloutd_LDADD): Remove libdbm.a.
* src/calloutd.c: Update.
* src/main.c (mf_cfg_param): lock-retry-count and
lock-retry-timeout are no-op now.
* src/mfdbtool.c: Likewise.

7 files changed, 328 insertions, 235 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 4400f8d4..af404ca5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,13 +45,12 @@ mailfromd_SOURCES = \
 
 mailfromd_LDADD = \
  ./libcallout.a\
  builtin/libbuiltin.a\
  ../lib/libmfdb.a\
  ../lib/libmf.a\
- ../lib/libdbm.a\
  ../gnu/libgnu.a\
  $(MAILUTILS_LIBS)\
  $(MILTER)\
  $(GEOIP_LIBS)\
  $(DSPAM_LIBS)
 
@@ -68,24 +67,22 @@ calloutd_SOURCES = \
  calloutd.c
 
 calloutd_LDADD = \
  ./libcallout.a\
  ../lib/libmfdb.a\
  ../lib/libmf.a\
- ../lib/libdbm.a\
  ../gnu/libgnu.a\
  $(MAILUTILS_LIBS)\
  $(MILTER)
 
 mfdbtool_SOURCES = \
  mfdbtool.c
 
 mfdbtool_LDADD = \
  ../lib/libmfdb.a\
  ../lib/libmf.a\
- ../lib/libdbm.a\
  ../gnu/libgnu.a\
  $(MAILUTILS_LIBS)
 
 EXTRA_DIST = \
  dbgmod.awk\
  drv.awk\
diff --git a/src/builtin/db.bi b/src/builtin/db.bi
index a734dc10..90d926eb 100644
--- a/src/builtin/db.bi
+++ b/src/builtin/db.bi
@@ -13,13 +13,12 @@
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #define DEFAULT_DB_MODE 0640
 #include <fnmatch.h>
-#include "mf-dbm.h"
 
 struct db_prop {                /* Database properties */
         char *pat;              /* Database name pattern */
         mode_t mode;            /* File mode */
         int null;               /* Null byte */
 };
@@ -140,64 +139,100 @@ db_prop_lookup(const char *name)
                                 found = p;
                 }
                 mu_iterator_destroy(&itr);
         }
         return found;   
 }
+
+int 
+_mf_dbm_open(mu_dbm_file_t *pdb, char *dbname, int access, int mode)
+{
+        mu_dbm_file_t db;
+        int rc;
+        int sflg = MU_FILE_SAFETY_LINKED_WRDIR |
+                   MU_FILE_SAFETY_DIR_IWOTH;
+
+        rc = mu_dbm_create(dbname, &db);
+        if (rc)
+                return rc;
+
+        mu_dbm_safety_set_flags(db,
+                                sflg | mf_file_mode_to_safety_criteria(mode));
+        rc = mu_dbm_safety_check(db);
+        if (rc && rc != ENOENT) {
+                mu_error(_("%s fails safety check: %s"),
+                         dbname, mu_strerror(rc));
+                mu_dbm_destroy(&db);
+                return rc;
+        }
+        /* FIXME: Safety checking */
+        rc = mu_dbm_open(db, access, mode);
+        if (rc)
+                return rc;
+        *pdb = db;
+        return rc;
+}
 
 
 #define LOOKUP_NULL_BYTE 0x1
 #define LOOKUP_TEST_ONLY 0x2
 
 MF_DSEXP_SUPPRESS([<dbmap_lookup>],[<
 static int
 dbmap_lookup(eval_environ_t env, char *dbname, const char *keystr,
              const char *defval, int flags)
 {
         int rc;
-        MF_DBM_FILE db;
-        MF_DBM_DATUM key;
-        MF_DBM_DATUM contents;
+        mu_dbm_file_t db;
+        struct mu_dbm_datum key;
+        struct mu_dbm_datum contents;
 
         if (!defval)
                 defval = "";
-        if (mf_dbm_open(dbname, &db, MU_STREAM_READ, 0, NULL))
+        rc = _mf_dbm_open(&db, dbname, MU_STREAM_READ, 0);
+        if (rc)
                 MF_THROW(mfe_dbfailure,
                          _("mf_dbm_open(%s) failed: %s"),
                          dbname,
-                         mf_dbm_strerror());
+                         mu_strerror(rc));
 
         memset(&key, 0, sizeof key);
         memset(&contents, 0, sizeof contents);
-        MF_DATUM_PTR(key) = (void*) keystr;
-        MF_DATUM_SIZE(key) = strlen(keystr);
+        key.mu_dptr = (void*) keystr;
+        key.mu_dsize = strlen(keystr);
         if (flags & LOOKUP_NULL_BYTE)
-                MF_DATUM_SIZE(key)++;
-        rc = mf_dbm_fetch(&db, key, &contents) == 0;
+                key.mu_dsize++;
+        rc = mu_dbm_fetch(db, &key, &contents);
+        if (rc && rc != MU_ERR_NOENT) {
+                mu_dbm_destroy(&db);
+                MF_THROW(mfe_dbfailure,
+                         _("cannot fetch data: %s"),
+                         mu_dbm_strerror(db));
+        }
         MF_DEBUG(MU_DEBUG_TRACE5,
-                 ("Looking up %s: %s", keystr, rc ? "true" : "false"));
+                 ("Looking up %s: %s", keystr, rc ? "false" : "true"));
         if (flags & LOOKUP_TEST_ONLY) 
                 push(env, (STKVAL)rc);
         else {
                 if (!rc) {
                         if (defval)
                                 pushs(env, (STKVAL)defval);
                         else
                                 push(env, 0);
-                } else if (((char*)MF_DATUM_PTR(contents))[MF_DATUM_SIZE(contents)-1]) {
+                } else if (((char*)contents.mu_dptr)[contents.mu_dsize-1]) {
                         size_t off;
-                        size_t len = MF_DATUM_SIZE(contents);
+                        size_t len = contents.mu_dsize;
                         char *s = MF_ALLOC_HEAP(off, len + 1);
-                        memcpy(s, MF_DATUM_PTR(contents), len);
+                        memcpy(s, contents.mu_dptr, len);
                         s[len] = 0;
                         push(env, (STKVAL) off);
                 } else
-                        pushs(env, MF_DATUM_PTR(contents));
+                        pushs(env, contents.mu_dptr);
         }
-        mf_dbm_datum_free(&contents);
-        mf_dbm_close(&db);
+        mu_dbm_datum_free(&contents);
+        mu_dbm_destroy(&db);
         return rc;
 }
 >])
 
 MF_DSEXP