--- cfengine-2.1.22/src/instrument.c.db	2007-03-02 06:03:43.000000000 -0800
+++ cfengine-2.1.22/src/instrument.c	2007-03-02 06:06:05.000000000 -0800
@@ -69,7 +69,11 @@
    return;
    }
 
+#ifdef CF_OLD_DB
+if ((errno = dbp->open(dbp,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+#else
 if ((errno = dbp->open(dbp,NULL,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+#endif
    {
    snprintf(OUTPUT,CF_BUFSIZE*2,"Couldn't open last-seen database %s\n",name);
    CfLog(cferror,OUTPUT,"db_open");
@@ -164,7 +168,11 @@
    return;
    }
 
+#ifdef CF_OLD_DB
+if ((errno = dbp->open(dbp,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+#else
 if ((errno = dbp->open(dbp,NULL,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+#endif
    {
    snprintf(OUTPUT,CF_BUFSIZE*2,"Couldn't open last-seen database %s\n",name);
    CfLog(cferror,OUTPUT,"db_open");
--- cfengine-2.1.22/src/checksum_db.c.db	2007-03-02 06:12:59.000000000 -0800
+++ cfengine-2.1.22/src/checksum_db.c	2007-03-02 06:14:25.000000000 -0800
@@ -118,7 +118,11 @@
    return false;
    }
 
+#ifdef CF_OLD_DB
+if ((errno = dbp->open(dbp,CHECKSUMDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+#else
 if ((errno = dbp->open(dbp,NULL,CHECKSUMDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+#endif
    {
    snprintf(OUTPUT,CF_BUFSIZE*2,"Couldn't open checksum database %s\n",CHECKSUMDB);
    CfLog(cferror,OUTPUT,"db_open");
@@ -218,7 +222,11 @@
    return;
    }
 
+#ifdef CF_OLD_DB
+if ((errno = dbp->open(dbp,CHECKSUMDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+#else
 if ((errno = dbp->open(dbp,NULL,CHECKSUMDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+#endif
    {
    snprintf(OUTPUT,CF_BUFSIZE*2,"Couldn't open checksum database %s\n",CHECKSUMDB);
    CfLog(cferror,OUTPUT,"db_open");
--- cfengine-2.1.22/src/cfshow.c.db	2007-03-02 06:22:40.000000000 -0800
+++ cfengine-2.1.22/src/cfshow.c	2007-03-02 06:34:27.000000000 -0800
@@ -212,7 +212,11 @@
    return;
    }
 
+#ifdef CF_OLD_DB
+if ((errno = dbp->open(dbp,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+#else
 if ((errno = dbp->open(dbp,NULL,name,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+#endif
    {
    printf("Couldn't open last-seen database %s\n",name);
    perror("db_open");
@@ -308,7 +312,11 @@
    return;
    }
 
+#ifdef CF_OLD_DB
+if ((errno = dbp->open(dbp,checksumdb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+#else
 if ((errno = dbp->open(dbp,NULL,checksumdb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+#endif
    {
    printf("Couldn't open checksum database %s\n",checksumdb);
    perror("db_open");
@@ -386,7 +394,11 @@
    return;
    }
 
+#ifdef CF_OLD_DB
+if ((errno = dbp->open(dbp,lockdb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+#else
 if ((errno = dbp->open(dbp,NULL,lockdb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
+#endif
    {
    printf("Couldn't open checksum database %s\n",lockdb);
    perror("db_open");