New MySQL CNID backend

[netatalk.git] / etc / cnid_dbd / dbd_dbcheck.c

diff --git a/etc/cnid_dbd/dbd_dbcheck.c b/etc/cnid_dbd/dbd_dbcheck.c
index b55a1e5c0754e5b6121cb14c588a7ee4b8468092..27f9021eeffc45e8075183d96680c5332d145820 100644 (file)
--- a/etc/cnid_dbd/dbd_dbcheck.c
+++ b/etc/cnid_dbd/dbd_dbcheck.c
@@ -1,5 +1,4 @@
 /*
- * $Id: dbd_dbcheck.c,v 1.3 2009-04-21 08:55:44 franklahm Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -9,29 +8,29 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-
 #include <stdio.h>
 #include <string.h>
 #include <sys/param.h>
 #include <errno.h>
-#include <netatalk/endian.h>
+#include <arpa/inet.h>
+
 #include <atalk/logger.h>
-#include <atalk/cnid_dbd_private.h>
+#include <atalk/cnid_bdb_private.h>
 
 #include "pack.h"
 #include "dbif.h"
 #include "dbd.h"
 
-int dbd_check_indexes(char *dbdir)
+int dbd_check_indexes(DBD *dbd, char *dbdir)
 {
     u_int32_t c_didname = 0, c_devino = 0, c_cnid = 0;
 
     LOG(log_note, logtype_cnid, "CNID database at `%s' is being checked (quick)", dbdir);
 
-    if (dbif_count(DBIF_IDX_CNID, &c_cnid)) 
+    if (dbif_count(dbd, DBIF_CNID, &c_cnid)) 
         return -1;
 
-    if (dbif_count(DBIF_IDX_DEVINO, &c_devino))
+    if (dbif_count(dbd, DBIF_IDX_DEVINO, &c_devino))
         return -1;
 
     /* bailout after the first error */
@@ -40,7 +39,7 @@ int dbd_check_indexes(char *dbdir)
         return 1;
     }
 
-    if (dbif_count(DBIF_IDX_DIDNAME, &c_didname)) 
+    if (dbif_count(dbd, DBIF_IDX_DIDNAME, &c_didname)) 
         return -1;
     
     if ( c_cnid != c_didname) {