1afaf51bfa
* Host source files on my local area * While here, re-generate patches with make makepatch Sponsored by: Rubicon Communications, LLC (Netgate)
46 lines
1.4 KiB
C
46 lines
1.4 KiB
C
--- src/sgDb.c.orig 2008-07-14 18:29:41 UTC
|
|
+++ src/sgDb.c
|
|
@@ -119,14 +119,39 @@ void sgDbInit(Db, file)
|
|
flag = DB_CREATE;
|
|
if(createdb)
|
|
flag = flag | DB_TRUNCATE;
|
|
- if ((ret =
|
|
- Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) {
|
|
+ if ((ret = Db->dbp->open(Db->dbp,
|
|
+#if DB_VERSION_MINOR >= 1
|
|
+ NULL,
|
|
+#endif
|
|
+ dbfile, NULL, DB_BTREE, flag, 0664)) != 0) {
|
|
(void) Db->dbp->close(Db->dbp, 0);
|
|
sgLogFatalError("Error db_open: %s", strerror(ret));
|
|
}
|
|
} else {
|
|
- if ((ret =
|
|
- Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
|
|
+ if ((ret = Db->dbp->open(Db->dbp,
|
|
+#if DB_VERSION_MINOR >= 1
|
|
+ NULL,
|
|
+#endif
|
|
+ dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
|
|
+ sgLogFatalError("Error db_open: %s", strerror(ret));
|
|
+ }
|
|
+ }
|
|
+#endif
|
|
+#if DB_VERSION_MAJOR >= 5
|
|
+ if(globalUpdate || createdb || (dbfile != NULL && stat(dbfile,&st))){
|
|
+ flag = DB_CREATE;
|
|
+ if(createdb)
|
|
+ flag = flag | DB_TRUNCATE;
|
|
+ if ((ret = Db->dbp->open(Db->dbp,
|
|
+ NULL,
|
|
+ dbfile, NULL, DB_BTREE, flag, 0664)) != 0) {
|
|
+ (void) Db->dbp->close(Db->dbp, 0);
|
|
+ sgLogFatalError("Error db_open: %s", strerror(ret));
|
|
+ }
|
|
+ } else {
|
|
+ if ((ret = Db->dbp->open(Db->dbp,
|
|
+ NULL,
|
|
+ dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
|
|
sgLogFatalError("Error db_open: %s", strerror(ret));
|
|
}
|
|
}
|