Deprecate legacy cnid backends

.github/workflows/build.yml

@@ -22,7 +22,7 @@ on:
       - 'README.md'
 
 env:
-  APT_PACKAGES: libtool libtool-bin automake autoconf libevent-dev libssl-dev libgcrypt-dev libkrb5-dev libpam0g-dev libdb-dev libtdb-dev libmysqlclient-dev libavahi-client-dev libacl1-dev libcrack2-dev libdbus-1-dev libdbus-glib-1-dev libglib2.0-dev systemtap-sdt-dev tracker tcpd
+  APT_PACKAGES: libtool libtool-bin automake autoconf libevent-dev libssl-dev libgcrypt-dev libkrb5-dev libpam0g-dev libdb-dev libmysqlclient-dev libavahi-client-dev libacl1-dev libcrack2-dev libdbus-1-dev libdbus-glib-1-dev libglib2.0-dev systemtap-sdt-dev tracker tcpd
 
 jobs:
   build-ubuntu:

.travis.yml

@@ -11,7 +11,6 @@ before_install:
       libkrb5-dev
       libpam0g-dev
       libdb-dev
-      libtdb-dev
       libmysqlclient-dev
       libavahi-client-dev
       libacl1-dev

configure.ac

@@ -185,9 +185,6 @@ AC_NETATALK_RECVFILE
 dnl Check whether bundled libevent shall not be used
 AC_NETATALK_LIBEVENT
 
-dnl Check whether bundled tdb shall be used
-AC_NETATALK_TDB
-
 dnl Check whether bundled talloc shall be used
 AC_NETATALK_TALLOC
 
@@ -280,16 +277,13 @@ AC_CONFIG_FILES([
   libatalk/adouble/Makefile
   libatalk/bstring/Makefile
   libatalk/cnid/Makefile
-  libatalk/cnid/cdb/Makefile
   libatalk/cnid/last/Makefile
   libatalk/cnid/dbd/Makefile
-  libatalk/cnid/tdb/Makefile
   libatalk/cnid/mysql/Makefile
   libatalk/compat/Makefile
   libatalk/dsi/Makefile
   libatalk/iniparser/Makefile
   libatalk/talloc/Makefile
-  libatalk/tdb/Makefile
   libatalk/unicode/Makefile
   libatalk/unicode/charsets/Makefile
   libatalk/util/Makefile

doc/manpages/man5/afp.conf.5.xml

@@ -2214,19 +2214,6 @@
     </para>
 
     <variablelist>
-      <varlistentry>
-        <term>cdb</term>
-
-        <listitem>
-          <para>"Concurrent database", backend is based on Oracle Berkeley DB.
-          With this backend several <command>afpd</command> daemons access the
-          CNID database directly. Berkeley DB locking is used to synchronize
-          access, if more than one <command>afpd</command> process is active
-          for a volume. The drawback is, that the crash of a single
-          <command>afpd</command> process might corrupt the database.</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term>dbd</term>
 

doc/manual/configuration.xml

@@ -225,23 +225,6 @@ basedir regex = /usr/home</programlisting></para>
         </itemizedlist>
       </note>
 
-      <sect3>
-        <title>cdb<indexterm>
-            <primary>CDB</primary>
-
-            <secondary>"cdb" CNID backend</secondary>
-          </indexterm></title>
-
-        <para>The "concurrent database" backend is based on Berkeley DB. With
-        this backend, several afpd daemons access the CNID database directly.
-        Berkeley DB locking is used to synchronize access, if more than one
-        afpd process is active for a volume. The drawback is, that the crash
-        of a single afpd process might corrupt the database. cdb should only
-        be used when sharing home directories for a larger number of users
-        <emphasis>and</emphasis> it has been determined that a large number of
-        <command>cnid_dbd</command> processes is problematic.</para>
-      </sect3>
-
       <sect3>
         <title>dbd<indexterm>
             <primary>DBD</primary>
@@ -257,25 +240,6 @@ basedir regex = /usr/home</programlisting></para>
         <para>This is the default backend since Netatalk 2.1.</para>
       </sect3>
 
-      <sect3>
-        <title>tdb<indexterm>
-            <primary>tdb</primary>
-
-            <secondary>"tdb" CNID backend</secondary>
-          </indexterm></title>
-
-        <para><abbrev>tdb</abbrev> is another persistent CNID database, it's
-        Samba's <emphasis>Trivial Database</emphasis>. It could be used
-        instead of <abbrev>cdb</abbrev> for user volumes.<important>
-            <para>Only ever use it for volumes that are
-            <emphasis>not</emphasis> shared and accessed by multiple clients
-            at once !</para>
-          </important>This backend is also used internally (as in-memory CNID
-        database) as a fallback in case opening the primary database can't be
-        opened, because <abbrev>tdb</abbrev> can work as in-memory database.
-        This of course means upon restart the CNIDs are gone.</para>
-      </sect3>
-
       <sect3>
         <title>last<indexterm>
             <primary>Last</primary>

etc/afpd/afp_options.c

@@ -67,31 +67,12 @@ static void show_version( void )
 	puts( "" );
 
 	printf( "         CNID backends:\t" );
-#ifdef CNID_BACKEND_CDB
-	printf( "cdb ");
-#endif
-#ifdef CNID_BACKEND_DB3
-	printf( "db3 " );
-#endif
 #ifdef CNID_BACKEND_DBD
-#ifdef CNID_BACKEND_DBD_TXN
-	printf( "dbd-txn " );
-#else
 	printf( "dbd " );
 #endif
-#endif
-#ifdef CNID_BACKEND_HASH
-	printf( "hash " );
-#endif
 #ifdef CNID_BACKEND_LAST
 	printf( "last " );
 #endif
-#ifdef CNID_BACKEND_MTAB
-	printf( "mtab " );
-#endif
-#ifdef CNID_BACKEND_TDB
-	printf( "tdb " );
-#endif
 #ifdef CNID_BACKEND_MYSQL
 	printf( "mysql " );
 #endif

include/atalk/Makefile.am

@@ -34,7 +34,6 @@ noinst_HEADERS = \
 	queue.h \
 	server_child.h \
 	server_ipc.h \
-	tdb.h \
 	cnid_bdb_private.h \
 	cnid_mysql_private.h \
 	cnid_private.h \

libatalk/Makefile.am

@@ -36,8 +36,3 @@ libatalk_la_DEPENDENCIES = \
 	util/libutil.la		\
 	vfs/libvfs.la
 
-if USE_BUILTIN_TDB
-SUBDIRS += tdb
-libatalk_la_LIBADD += tdb/libtdb.la
-libatalk_la_DEPENDENCIES += tdb/libtdb.la
-endif

libatalk/cnid/Makefile.am

@@ -1,22 +1,14 @@
 # Makefile.am for libatalk/cnid/
 
-SUBDIRS = last cdb dbd tdb
+SUBDIRS = last dbd
 
 noinst_LTLIBRARIES = libcnid.la
 LIBCNID_DEPS = dbd/libcnid_dbd.la
 
-if USE_CDB_BACKEND
-LIBCNID_DEPS += cdb/libcnid_cdb.la
-endif
-
 if USE_LAST_BACKEND
 LIBCNID_DEPS += last/libcnid_last.la
 endif
 
-if USE_TDB_BACKEND
-LIBCNID_DEPS += tdb/libcnid_tdb.la
-endif
-
 if USE_MYSQL_BACKEND
 SUBDIRS += mysql
 LIBCNID_DEPS += @MYSQL_LIBS@ mysql/libcnid_mysql.la