summaryrefslogtreecommitdiff
path: root/security/heimdal/patches/patch-af
blob: 0746db4c67314afbe70e081eb4730688a66b4a91 (plain)
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
$NetBSD: patch-af,v 1.1 2004/02/22 11:59:50 markd Exp $

--- lib/hdb/db3.c.orig	2001-08-09 20:41:48.000000000 +1200
+++ lib/hdb/db3.c
@@ -37,7 +37,13 @@ RCSID("$Id: db3.c,v 1.8 2001/08/09 08:41
 
 #if HAVE_DB3
 
+#if defined(HAVE_DB4_DB_H)
+#include <db4/db.h>
+#elif defined(HAVE_DB3_DB_H)
+#include <db3/db.h>
+#else
 #include <db.h>
+#endif
 
 static krb5_error_code
 DB_close(krb5_context context, HDB *db)
@@ -262,10 +268,18 @@ DB_open(krb5_context context, HDB *db, i
     }
     db_create(&d, NULL, 0);
     db->db = d;
+#if defined(HAVE_DB4_DB_H)
+    if ((ret = d->open(db->db, NULL, fn, NULL, DB_BTREE, myflags, mode))) {
+#else
     if ((ret = d->open(db->db, fn, NULL, DB_BTREE, myflags, mode))) {
+#endif
       if(ret == ENOENT)
 	/* try to open without .db extension */
+#if defined(HAVE_DB4_DB_H)
+	if (d->open(db->db, NULL, db->name, NULL, DB_BTREE, myflags, mode)) {
+#else
 	if (d->open(db->db, db->name, NULL, DB_BTREE, myflags, mode)) {
+#endif
 	  free(fn);
 	  krb5_set_error_string(context, "opening %s: %s",
 				db->name, strerror(ret));