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
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
|
--- lib/softoken/legacydb/cdbhdl.h Sun Apr 25 11:03:16 2004
+++ lib/softoken/legacydb/cdbhdl.h Fri Jul 22 00:25:16 2005
@@ -43,6 +43,6 @@
#define _CDBHDL_H_
-#include "nspr.h"
-#include "mcom_db.h"
+#include <nspr.h>
+#include <db.h>
#include "pcertt.h"
--- lib/softoken/legacydb/dbmshim.c Tue Mar 29 13:21:18 2005
+++ lib/softoken/legacydb/dbmshim.c Fri Jul 22 00:35:33 2005
@@ -40,5 +40,6 @@
* $Id: patch-sysdb,v 1.4 2007-09-05 12:40:41 ahze Exp $
*/
-#include "mcom_db.h"
+#include <db.h>
+#include <fcntl.h>
#include "secitem.h"
#include "secder.h"
--- lib/softoken/legacydb/keydb.c Fri Jun 4 20:50:32 2004
+++ lib/softoken/legacydb/keydb.c Fri Jul 22 00:37:01 2005
@@ -46,5 +46,6 @@
#include "secitem.h"
#include "pcert.h"
-#include "mcom_db.h"
+#include <db.h>
+#include <fcntl.h>
#include "lowpbe.h"
#include "secerr.h"
--- lib/softoken/legacydb/pcertdb.c Tue Mar 29 13:21:18 2005
+++ lib/softoken/legacydb/pcertdb.c Fri Jul 22 00:40:00 2005
@@ -44,5 +44,6 @@
#include "lowkeyti.h"
#include "pcert.h"
-#include "mcom_db.h"
+#include <db.h>
+#include <fcntl.h>
#include "pcert.h"
#include "secitem.h"
--- lib/softoken/legacydb/pk11db.c Fri Apr 1 19:46:13 2005
+++ lib/softoken/legacydb/pk11db.c Fri Jul 22 00:42:01 2005
@@ -42,5 +42,6 @@
#include "pk11pars.h"
#include "pkcs11i.h"
-#include "mcom_db.h"
+#include <db.h>
+#include <fcntl.h>
#include "cdbhdl.h"
#include "secerr.h"
--- lib/softoken/legacydb/keydbi.h Tue Apr 27 19:04:38 2004
+++ lib/softoken/legacydb/keydbi.h Fri Jul 22 00:43:24 2005
@@ -42,7 +42,7 @@
#define _KEYDBI_H_
-#include "nspr.h"
+#include <nspr.h>
#include "seccomon.h"
-#include "mcom_db.h"
+#include <db.h>
/*
--- lib/softoken/legacydb/config.mk Mon May 24 20:13:11 2004
+++ lib/softoken/legacydb/config.mk Fri Jul 22 00:55:20 2005
@@ -47,5 +47,4 @@
$(CRYPTOLIB) \
$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
$(NULL)
--- lib/certdb/certdb.c Sat Mar 5 03:03:03 2005
+++ lib/certdb/certdb.c Fri Jul 22 01:02:11 2005
@@ -53,5 +53,4 @@
#include "keyhi.h"
#include "secitem.h"
-#include "mcom_db.h"
#include "certdb.h"
#include "prprf.h"
--- lib/certdb/genname.c Sun Apr 25 11:03:03 2004
+++ lib/certdb/genname.c Fri Jul 22 01:02:59 2005
@@ -39,5 +39,4 @@
#include "secitem.h"
#include "secoidt.h"
-#include "mcom_db.h"
#include "secasn1.h"
#include "secder.h"
--- lib/certdb/stanpcertdb.c Thu Dec 2 16:34:15 2004
+++ lib/certdb/stanpcertdb.c Fri Jul 22 01:03:19 2005
@@ -38,5 +38,4 @@
#include "cert.h"
-#include "mcom_db.h"
#include "certdb.h"
#include "secitem.h"
--- lib/certdb/xauthkid.c Sun Apr 25 11:03:03 2004
+++ lib/certdb/xauthkid.c Fri Jul 22 01:03:54 2005
@@ -40,6 +40,5 @@
*/
-#include "prtypes.h"
-#include "mcom_db.h"
+#include <prtypes.h>
#include "seccomon.h"
#include "secdert.h"
--- lib/certdb/xbsconst.c Sun Apr 25 11:03:03 2004
+++ lib/certdb/xbsconst.c Fri Jul 22 01:05:41 2005
@@ -39,6 +39,6 @@
*/
-#include "prtypes.h"
-#include "mcom_db.h"
+#include <limits.h> /* LONG_MAX */
+#include <prtypes.h>
#include "seccomon.h"
#include "secdert.h"
@@ -48,5 +48,5 @@
#include "certt.h"
#include "secder.h"
-#include "prprf.h"
+#include <prprf.h>
#include "secerr.h"
--- lib/certdb/xconst.c Tue Nov 9 01:13:32 2004
+++ lib/certdb/xconst.c Fri Jul 22 01:06:20 2005
@@ -39,6 +39,5 @@
*/
-#include "prtypes.h"
-#include "mcom_db.h"
+#include <prtypes.h>
#include "seccomon.h"
#include "secdert.h"
@@ -48,5 +47,5 @@
#include "cert.h"
#include "secder.h"
-#include "prprf.h"
+#include <prprf.h>
#include "xconst.h"
#include "genname.h"
--- lib/ckfw/dbm/ckdbm.h Wed Jan 19 21:25:47 2005
+++ lib/ckfw/dbm/ckdbm.h Fri Jul 22 01:06:58 2005
@@ -57,5 +57,5 @@
#endif /* CKT_H */
-#include "mcom_db.h"
+#include <db.h>
NSS_EXTERN_DATA NSSCKMDInstance nss_dbm_mdInstance;
--- lib/freebl/mac_rand.c Sun Apr 25 11:03:08 2004
+++ lib/freebl/mac_rand.c Fri Jul 22 01:08:19 2005
@@ -40,5 +40,4 @@
#endif
#include "secrng.h"
-#include "mcom_db.h"
#ifdef XP_MAC
#include <Events.h>
--- lib/pk11wrap/secmodi.h Mon Mar 28 15:45:37 2005
+++ lib/pk11wrap/secmodi.h Fri Jul 22 01:08:47 2005
@@ -42,5 +42,5 @@
#include "pkcs11.h"
#include "nssilock.h"
-#include "mcom_db.h"
+#include <db.h>
#include "secoidt.h"
#include "secdert.h"
--- lib/softoken/legacydb/lginit.c.orig 2007-09-05 06:52:46.000000000 -0400
+++ lib/softoken/legacydb/lginit.c 2007-09-05 06:53:06.000000000 -0400
@@ -38,6 +38,7 @@
* ***** END LICENSE BLOCK ***** */
/* $Id: patch-sysdb,v 1.4 2007-09-05 12:40:41 ahze Exp $ */
+#include <fcntl.h>
#include "lowkeyi.h"
#include "pcert.h"
#include "keydbi.h"
|
