summaryrefslogtreecommitdiff
path: root/www/squidguard/files/patch-src__sgDb.c
blob: 47e600da11d026c9c88136cd789a61154da0aeb0 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
--- src/sgDb.c.orig	2008-07-14 20:29:41.000000000 +0200
+++ src/sgDb.c	2014-01-14 11:53:55.712138134 +0100
@@ -119,14 +119,39 @@
     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,
+#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) {
+    if ((ret = Db->dbp->open(Db->dbp,
+	NULL,
+	dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
       sgLogFatalError("Error db_open: %s", strerror(ret));
     }
   }