#! /bin/sh /usr/share/dpatch/dpatch-run
## fix-pref-del.dpatch by Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: fix infinite loop when deleting preferences from flat files.

@DPATCH@
diff -urNad dspam-3.6.6~/src/hash_drv.c dspam-3.6.6/src/hash_drv.c
--- dspam-3.6.6~/src/hash_drv.c	2006-05-29 12:26:32.000000000 -0400
+++ dspam-3.6.6/src/hash_drv.c	2006-05-29 12:26:43.288483432 -0400
@@ -1174,6 +1174,6 @@
 int _ds_pref_del(config_t config, const char *user, const char *home,
   const char *attrib, void *dbh)
 {
-  return _ds_pref_del(config, user, home, attrib, dbh);
+  return _ds_ff_pref_del(config, user, home, attrib, dbh);
 }
 
diff -urNad dspam-3.6.6~/src/mysql_drv.c dspam-3.6.6/src/mysql_drv.c
--- dspam-3.6.6~/src/mysql_drv.c	2006-05-29 12:26:32.000000000 -0400
+++ dspam-3.6.6/src/mysql_drv.c	2006-05-29 12:26:43.290483128 -0400
@@ -2344,7 +2344,7 @@
 int _ds_pref_del(config_t config, const char *user, const char *home,
   const char *attrib, void *dbh)
 {
-  return _ds_pref_del(config, user, home, attrib, dbh);
+  return _ds_ff_pref_del(config, user, home, attrib, dbh);
 }
 #endif
 
diff -urNad dspam-3.6.6~/src/ora_drv.c dspam-3.6.6/src/ora_drv.c
--- dspam-3.6.6~/src/ora_drv.c	2006-05-29 12:26:32.000000000 -0400
+++ dspam-3.6.6/src/ora_drv.c	2006-05-29 12:26:43.292482824 -0400
@@ -2503,6 +2503,6 @@
 int _ds_pref_del(config_t config, const char *user, const char *home,
   const char *attrib, void *dbh)
 {
-  return _ds_pref_del(config, user, home, attrib, dbh);
+  return _ds_ff_pref_del(config, user, home, attrib, dbh);
 }
 
diff -urNad dspam-3.6.6~/src/pgsql_drv.c dspam-3.6.6/src/pgsql_drv.c
--- dspam-3.6.6~/src/pgsql_drv.c	2006-05-29 12:26:32.000000000 -0400
+++ dspam-3.6.6/src/pgsql_drv.c	2006-05-29 12:26:43.294482520 -0400
@@ -2433,7 +2433,7 @@
 int _ds_pref_del(config_t config, const char *user, const char *home,
   const char *attrib, void *dbh)
 {
-  return _ds_pref_del(config, user, home, attrib, dbh);
+  return _ds_ff_pref_del(config, user, home, attrib, dbh);
 }
 
 #endif
diff -urNad dspam-3.6.6~/src/sqlite3_drv.c dspam-3.6.6/src/sqlite3_drv.c
--- dspam-3.6.6~/src/sqlite3_drv.c	2006-05-29 12:26:32.000000000 -0400
+++ dspam-3.6.6/src/sqlite3_drv.c	2006-05-29 12:26:43.295482368 -0400
@@ -1365,6 +1365,6 @@
 int _ds_pref_del(config_t config, const char *user, const char *home,
   const char *attrib, void *dbh)
 {
-  return _ds_pref_del(config, user, home, attrib, dbh);
+  return _ds_ff_pref_del(config, user, home, attrib, dbh);
 }
 
diff -urNad dspam-3.6.6~/src/sqlite_drv.c dspam-3.6.6/src/sqlite_drv.c
--- dspam-3.6.6~/src/sqlite_drv.c	2006-05-29 12:26:32.000000000 -0400
+++ dspam-3.6.6/src/sqlite_drv.c	2006-05-29 12:26:43.296482216 -0400
@@ -1410,6 +1410,6 @@
 int _ds_pref_del(config_t config, const char *user, const char *home,
   const char *attrib, void *dbh)
 {
-  return _ds_pref_del(config, user, home, attrib, dbh);
+  return _ds_ff_pref_del(config, user, home, attrib, dbh);
 }
 
diff -urNad dspam-3.6.6~/src/storage_driver.c dspam-3.6.6/src/storage_driver.c
--- dspam-3.6.6~/src/storage_driver.c	2006-05-29 12:26:32.000000000 -0400
+++ dspam-3.6.6/src/storage_driver.c	2006-05-29 12:27:21.820625656 -0400
@@ -304,12 +304,12 @@
   const char *attrib,
   void *dbh)
 {
-  int (*ptr)(config_t, const char *, const char *, void *);
-  ptr = (int (*)(config_t, const char *, const char *, void *))dlsym(_drv_handle, "_ds_pref_del");
+  int (*ptr)(config_t, const char *, const char *, const char *, void *);
+  ptr = (int (*)(config_t, const char *, const char *, const char *, void *))dlsym(_drv_handle, "_ds_pref_del");
   if (!ptr) {
     LOG(LOG_CRIT, "dlsym(_ds_pref_del) failed: %s", dlerror());
     return EFAILURE;
   }
-  return (*ptr)(config, user, home, dbh);
+  return (*ptr)(config, user, home, attrib, dbh);
 }