2003-01-04 Joe Marcus Clarke <marcus@marcuscom.com>
+ * Change all references to db3/DB3 to BDB since we now support
+ Berkeley DB3 and DB4.
* Add DB 4.1.x support.
2002-09-26 Andrew Morgan <morgan@orst.edu>
#
# cnid_maint: A script to maintain the consistency of CNID databases.
#
-# $Id: cnid_maint.in,v 1.12 2002-08-31 08:05:40 jmarcus Exp $
+# $Id: cnid_maint.in,v 1.13 2003-01-04 21:41:48 jmarcus Exp $
#
use strict;
# Below is the example of a BSD ps. A SYSV example is:
# /bin/ps -eflouid,pid,ppid,comm
$PS_CMD = '@PS@ -axouser,pid,ppid,command';
-$DB_STAT = '@DB3_PATH@bin/db_stat';
-$DB_RECOVER = '@DB3_PATH@bin/db_recover';
-$DB_VERIFY = '@DB3_PATH@bin/db_verify';
+$DB_STAT = '@BDB_PATH@bin/db_stat';
+$DB_RECOVER = '@BDB_PATH@bin/db_recover';
+$DB_VERIFY = '@BDB_PATH@bin/db_verify';
$APPLE_VOLUMES_FILE = '@PKGCONFDIR@/AppleVolumes.default';
## End edit section
-dnl $Id: configure.in,v 1.174 2002-12-05 11:16:33 srittau Exp $
+dnl $Id: configure.in,v 1.175 2003-01-04 21:41:48 jmarcus Exp $
dnl configure.in for netatalk
AC_INIT(bin/adv1tov2/adv1tov2.c)
fi
)
-dnl Don't use DB3 unless it's needed
-db3_required=no
+dnl Don't use BDB unless it's needed
+bdb_required=no
dnl Determine DID scheme
AC_MSG_CHECKING([for DID scheme to use])
AC_DEFINE(USE_LASTDID, 1)
AC_MSG_RESULT([last])
elif test "x$did_scheme" = "xcnid"; then
- db3_required="yes"
+ bdb_required="yes"
AC_DEFINE(CNID_DB, 1)
AC_MSG_RESULT([enabling build with CNID DB support])
else
AC_DEFINE(CNID_DB_CDB, 1)
fi
-dnl Check for Berkeley DB3 library
-if test "x$db3_required" = "xyes"; then
- AC_PATH_DB3(, [AC_MSG_ERROR([Berkeley DB3 library not found!])])
+dnl Check for Berkeley DB library
+if test "x$bdb_required" = "xyes"; then
+ AC_PATH_BDB(, [AC_MSG_ERROR([Berkeley DB library not found!])])
fi
dnl Check for quota support
scalable, and mission-critical database support to software
developers. BDB 3 can downloaded from
http://www.sleepycat.com/download.html
-Netatalk's CNID database uses the library and header files from BDB3.
+Netatalk's CNID database uses the library and header files from BDB.
Netatalk Frequently Asked Questions
-($Id: FAQ,v 1.9 2002-10-04 23:38:44 srittau Exp $)
+($Id: FAQ,v 1.10 2003-01-04 21:41:48 jmarcus Exp $)
-----------------------------------------------------------------------------
Q29: I compiled Samba with the --with-netatalk flag. What did that do?
Q30: What about the differences in naming schemes, and legal/illegal
characters between Windows, Macs (and unix?)
-Q31: Where can I get the cnid-db (berkely db3) software? (needed for
+Q31: Where can I get the cnid-db (Berkely DB) software? (needed for
--with-did=cnid)
Q32: What about security in Netatalk?
A: Compile with the --with-did=last flag set. This activates a different
method of calculating inodes in the software, and will hopefully fix some
of these problems. This code, along with the CNID code, was still being
- worked out in Pre7. The cnid/db3 flags also go along with this:
- --with-db3=PATH specify path to Berkeley DB3 installation
+ worked out in Pre7. The cnid/bdb flags also go along with this:
+ --with-bdb=PATH specify path to Berkeley DB installation
--with-did=[scheme] set DID scheme (cnid,last)
(For more information on CNID, see the README.cnid file [may not exist yet],
respectively). Educating the end user is important for this problem.
-Q31: Where can I get the cnid-db (berkely db3) software? (needed for
+Q31: Where can I get the cnid-db (Berkely DB) software? (needed for
--with-did=cnid)
A: First check to see if your unix has a port or package. If not,
system against the requirements of those options. It generally fails
if your system doesn't meet the requirements. You should read the
DEVELOPER file because some of these options require external sources
-to function correctly. (PAM, OpenSSL, Berkeley DB3, TCP Wrappers, etc).
+to function correctly. (PAM, OpenSSL, Berkeley DB, TCP Wrappers, etc).
Netatalk options to the ./configure script: Use ./configure --help for
a complete list.
--enable-dropkludge: enable the experimental dropbox fix
(INSECURE!),
---with-db3=PATH: specify path to Berkeley DB3 installation,
+--with-bdb=PATH: specify path to Berkeley DB installation,
--with-did=[scheme]: set DID scheme (cnid,last),
- CNID is a new scheme using Berkeley DB3 files to store a
+ CNID is a new scheme using Berkeley DB files to store a
per-volume cnid database persistently.
The last DID scheme recreates version 37b behaviour where
# Makefile.am for libatalk/cnid/
-CFLAGS = @CFLAGS@ @DB3_CFLAGS@
-LIBS = @LIBS@ @DB3_LIBS@
+CFLAGS = @CFLAGS@ @BDB_CFLAGS@
+LIBS = @LIBS@ @BDB_LIBS@
noinst_LTLIBRARIES = libcnid.la
/*
- * $Id: cnid_open.c,v 1.48 2003-01-04 20:52:15 jmarcus Exp $
+ * $Id: cnid_open.c,v 1.49 2003-01-04 21:41:49 jmarcus Exp $
*
* Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
* All Rights Reserved. See COPYRIGHT.
#ifndef CNID_DB_CDB
/* Let's try and use the youngest lock detector if present.
- * If we can't do that, then let DB3 use its default deadlock detector. */
+ * If we can't do that, then let BDB use its default deadlock detector. */
#if defined DB_LOCK_YOUNGEST
#define DEAD_LOCK_DETECT DB_LOCK_YOUNGEST
#else /* DB_LOCK_YOUNGEST */
-dnl $Id: db3-check.m4,v 1.7 2002-02-07 05:08:36 jmarcus Exp $
-dnl Autoconf macro to check for the Berkeley DB3 library
+dnl $Id: db3-check.m4,v 1.8 2003-01-04 21:41:49 jmarcus Exp $
+dnl Autoconf macro to check for the Berkeley DB library
-AC_DEFUN([AC_PATH_DB3], [
- trydb3dir=""
- AC_ARG_WITH(db3,
- [ --with-db3=PATH specify path to Berkeley DB3 installation],
+AC_DEFUN([AC_PATH_BDB], [
+ trybdbdir=""
+ AC_ARG_WITH(bdb,
+ [ --with-bdb=PATH specify path to Berkeley DB installation],
if test "x$withval" != "xno"; then
- trydb3dir="$withval"
+ trybdbdir="$withval"
fi
)
- db3found=no
- for db3dir in "" "$trydb3dir" "$trydb3dir/include" "$trydb3dir/include/db3" "/usr/local/BerkeleyDB.3.3/include" "/usr/local/include/db3" "/usr/local/include" "/usr/include/db3" "/usr/include" ; do
- if test -f "$db3dir/db.h" ; then
- db3libdir="`echo $db3dir | sed 's/include\/db3$/lib/'`"
- db3libdir="`echo $db3libdir | sed 's/include$/lib/'`"
+ bdbfound=no
+ for bdbdir in "" "$trybdbdir" "$trybdbdir/include" "$trybdbdir/include/db3" "/usr/local/BerkeleyDB.3.3/include" "/usr/local/include/db3" "/usr/local/include" "/usr/include/db3" "/usr/include" ; do
+ if test -f "$bdbdir/db.h" ; then
+ bdblibdir="`echo $bdbdir | sed 's/include\/db3$/lib/'`"
+ bdblibdir="`echo $bdblibdir | sed 's/include$/lib/'`"
savedcflags="$CFLAGS"
savedldflags="$LDFLAGS"
- CFLAGS="$CFLAGS -I$db3dir"
- LDFLAGS="-L$db3libdir $LDFLAGS"
+ CFLAGS="$CFLAGS -I$bdbdir"
+ LDFLAGS="-L$bdblibdir $LDFLAGS"
AC_CHECK_LIB(db, main, [
- db3found=yes
- DB3_CFLAGS="-I$db3dir"
- DB3_LIBS="-L$db3libdir -ldb"
- DB3_PATH="`echo $db3dir | sed 's,include/db3$,,'`"
+ bdbfound=yes
+ BDB_CFLAGS="-I$bdbdir"
+ BDB_LIBS="-L$bdblibdir -ldb"
+ BDB_PATH="`echo $bdbdir | sed 's,include/db3$,,'`"
])
CFLAGS="$savedcflags"
LDFLAGS="$savedldflags"
fi
done
- if test "x$db3found" = "xyes"; then
+ if test "x$bdbfound" = "xyes"; then
ifelse([$1], , :, [$1])
else
ifelse([$2], , :, [$2])
fi
- AC_SUBST(DB3_CFLAGS)
- AC_SUBST(DB3_LIBS)
- AC_SUBST(DB3_PATH)
+ AC_SUBST(BDB_CFLAGS)
+ AC_SUBST(BDB_LIBS)
+ AC_SUBST(BDB_PATH)
])
projects / netatalk.git / commitdiff