|
|
ce34f05 |
diff -up netatalk-2.0.4/bin/cnid/cnid_index.c.db4_2-db4_3 netatalk-2.0.4/bin/cnid/cnid_index.c
|
|
|
ce34f05 |
--- netatalk-2.0.4/bin/cnid/cnid_index.c.db4_2-db4_3 2009-07-14 15:54:50.444609410 +0200
|
|
|
ce34f05 |
+++ netatalk-2.0.4/bin/cnid/cnid_index.c 2009-07-14 15:58:10.143829111 +0200
|
|
|
ce34f05 |
@@ -277,11 +277,11 @@ static int dbif_count(const int dbi, u_i
|
|
|
ce34f05 |
#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
|
|
|
ce34f05 |
ret = db->stat(db, db_txn, &sp, 0);
|
|
|
ce34f05 |
#else
|
|
jvdias |
b32e39f |
- ret = db->stat(db, &sp, 0);
|
|
jvdias |
b32e39f |
+ ret = db->stat(db, (DB_TXN*)0L, &sp, 0);
|
|
|
ce34f05 |
#endif
|
|
jvdias |
b32e39f |
|
|
jvdias |
b32e39f |
if (ret) {
|
|
jvdias |
b32e39f |
- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));
|
|
jvdias |
b32e39f |
+ LOG(log_error, logtype_cnid, "error getting stat information on database: %s", db_strerror(errno));
|
|
jvdias |
b32e39f |
return -1;
|
|
jvdias |
b32e39f |
}
|
|
jvdias |
b32e39f |
|
|
|
ce34f05 |
diff -up netatalk-2.0.4/etc/cnid_dbd/dbif.c.db4_2-db4_3 netatalk-2.0.4/etc/cnid_dbd/dbif.c
|
|
|
ce34f05 |
--- netatalk-2.0.4/etc/cnid_dbd/dbif.c.db4_2-db4_3 2009-07-14 15:55:16.428613311 +0200
|
|
|
ce34f05 |
+++ netatalk-2.0.4/etc/cnid_dbd/dbif.c 2009-07-14 15:57:17.038828997 +0200
|
|
|
ce34f05 |
@@ -516,11 +516,11 @@ int dbif_count(const int dbi, u_int32_t
|
|
|
ce34f05 |
#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
|
|
|
ce34f05 |
ret = db->stat(db, db_txn, &sp, 0);
|
|
|
ce34f05 |
#else
|
|
jvdias |
b32e39f |
- ret = db->stat(db, &sp, 0);
|
|
jvdias |
b32e39f |
+ ret = db->stat(db, (DB_TXN*)0L, &sp, 0);
|
|
|
ce34f05 |
#endif
|
|
jvdias |
b32e39f |
|
|
jvdias |
b32e39f |
if (ret) {
|
|
jvdias |
b32e39f |
- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));
|
|
jvdias |
b32e39f |
+ LOG(log_error, logtype_cnid, "error getting stat information on database: %s", db_strerror(errno));
|
|
jvdias |
b32e39f |
return -1;
|
|
jvdias |
b32e39f |
}
|
|
jvdias |
b32e39f |
|