Updated the CtdlUserGoto() API call to also return the oldest and newest message...
[citadel.git] / citadel / serv_extensions.c
index 0553e34a9d68efd8bf1afa01587a5719329b000b..4b4e44c08ab958bdb32478fa6e1629dbaaf3cd8b 100644 (file)
@@ -5,46 +5,23 @@
  * Copyright (c) 1987-2011 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License, version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "sysdep.h"
 #include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <string.h>
-#include <limits.h>
-#include <ctype.h>
-#include <syslog.h>
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "serv_extensions.h"
-#include "sysdep_decls.h"
-#include "msgbase.h"
-#include "config.h"
 
+#include "sysdep_decls.h"
 #include "modules/crypto/serv_crypto.h"        /* Needed until a universal crypto startup hook is implimented for CtdlStartTLS */
 
+#include "serv_extensions.h"
 #include "ctdl_module.h"
 
-#ifndef HAVE_SNPRINTF
-#include <stdarg.h>
-#include "snprintf.h"
-#endif
 
 int DebugModules = 0;
  
@@ -52,12 +29,6 @@ int DebugModules = 0;
  * Structure defentitions for hook tables
  */
 
-typedef struct __LogDebugEntry {
-       CtdlDbgFunction F;
-       const char *Name;
-       long Len;
-       const int *LogP;
-} LogDebugEntry;
 HashList *LogDebugEntryTable = NULL;
 
 typedef struct LogFunctionHook LogFunctionHook;
@@ -66,7 +37,8 @@ struct LogFunctionHook {
        int loglevel;
        void (*h_function_pointer) (char *);
 };
-extern LogFunctionHook *LogHookTable;
+
+LogFunctionHook *LogHookTable = NULL;
 
 typedef struct FixedOutputHook FixedOutputHook;
 struct FixedOutputHook {
@@ -74,7 +46,23 @@ struct FixedOutputHook {
        char content_type[64];
        void (*h_function_pointer) (char *, int);
 };
-extern FixedOutputHook *FixedOutputTable;
+FixedOutputHook *FixedOutputTable = NULL;
+
+
+
+/*
+ * TDAPVetoHookFunctionHook extensions are used for any type of hook for which
+ * may prevent the autopurger to run for this specific data class.
+ * the function should at least LOG_INFO that it does so.
+ */
+typedef struct TDAPVetoHookFunctionHook TDAPVetoHookFunctionHook;
+struct TDAPVetoHookFunctionHook {
+       TDAPVetoHookFunctionHook *next;
+       int Priority;
+       int (*h_function_pointer) (StrBuf *);
+       int eventtype;
+};
+TDAPVetoHookFunctionHook *TDAPVetoHookTable = NULL;
 
 
 
@@ -87,11 +75,11 @@ extern FixedOutputHook *FixedOutputTable;
 typedef struct SessionFunctionHook SessionFunctionHook;
 struct SessionFunctionHook {
        SessionFunctionHook *next;
+       int Priority;
        void (*h_function_pointer) (void);
        int eventtype;
 };
-extern SessionFunctionHook *SessionHookTable;
-
+SessionFunctionHook *SessionHookTable = NULL;
 
 /*
  * UserFunctionHook extensions are used for any type of hook which implements
@@ -104,7 +92,7 @@ struct UserFunctionHook {
        void (*h_function_pointer) (struct ctdluser *usbuf);
        int eventtype;
 };
-extern UserFunctionHook *UserHookTable;
+UserFunctionHook *UserHookTable = NULL;
 
 /*
  * MessageFunctionHook extensions are used for hooks which implement handlers
@@ -113,10 +101,10 @@ extern UserFunctionHook *UserHookTable;
 typedef struct MessageFunctionHook MessageFunctionHook;
 struct MessageFunctionHook {
        MessageFunctionHook *next;
-       int (*h_function_pointer) (struct CtdlMessage *msg);
+       int (*h_function_pointer) (struct CtdlMessage *msg, recptypes *recps);
        int eventtype;
 };
-extern MessageFunctionHook *MessageHookTable;
+MessageFunctionHook *MessageHookTable = NULL;
 
 
 /*
@@ -128,7 +116,7 @@ struct NetprocFunctionHook {
        NetprocFunctionHook *next;
        int (*h_function_pointer) (struct CtdlMessage *msg, char *target_room);
 };
-extern NetprocFunctionHook *NetprocHookTable;
+NetprocFunctionHook *NetprocHookTable = NULL;
 
 
 /*
@@ -140,7 +128,7 @@ struct DeleteFunctionHook {
        DeleteFunctionHook *next;
        void (*h_function_pointer) (char *target_room, long msgnum);
 };
-extern DeleteFunctionHook *DeleteHookTable;
+DeleteFunctionHook *DeleteHookTable = NULL;
 
 
 /*
@@ -155,7 +143,7 @@ struct XmsgFunctionHook {
        int (*h_function_pointer) (char *, char *, char *, char *);
        int order;
 };
-extern XmsgFunctionHook *XmsgHookTable;
+XmsgFunctionHook *XmsgHookTable = NULL;
 
 
 
@@ -169,7 +157,7 @@ struct RoomFunctionHook {
        RoomFunctionHook *next;
        int (*fcn_ptr) (struct ctdlroom *);
 };
-extern RoomFunctionHook *RoomHookTable;
+RoomFunctionHook *RoomHookTable = NULL;
 
 
 
@@ -179,21 +167,12 @@ struct SearchFunctionHook {
        void (*fcn_ptr) (int *, long **, const char *);
        char *name;
 };
-extern SearchFunctionHook *SearchFunctionHookTable;
-
+SearchFunctionHook *SearchFunctionHookTable = NULL;
 
 CleanupFunctionHook *CleanupHookTable = NULL;
 CleanupFunctionHook *EVCleanupHookTable = NULL;
-SessionFunctionHook *SessionHookTable = NULL;
-UserFunctionHook *UserHookTable = NULL;
-XmsgFunctionHook *XmsgHookTable = NULL;
-MessageFunctionHook *MessageHookTable = NULL;
-NetprocFunctionHook *NetprocHookTable = NULL;
-DeleteFunctionHook *DeleteHookTable = NULL;
+
 ServiceFunctionHook *ServiceHookTable = NULL;
-FixedOutputHook *FixedOutputTable = NULL;
-RoomFunctionHook *RoomHookTable = NULL;
-SearchFunctionHook *SearchFunctionHookTable = NULL;
 
 typedef struct ProtoFunctionHook ProtoFunctionHook;
 struct ProtoFunctionHook {
@@ -394,52 +373,6 @@ void CtdlSetDebugLogFacilities(const char **Str, long n)
                DeleteHashPos(&Pos);
        }
 }
-void cmd_log_get(char *argbuf)
-{
-       long HKLen;
-       const char *ch;
-       HashPos *Pos;
-       void *vptr;
-
-       if (CtdlAccessCheck(ac_aide)) return;
-
-       cprintf("%d Log modules enabled:\n", LISTING_FOLLOWS);
-
-       Pos = GetNewHashPos(LogDebugEntryTable, 0);
-
-       while (GetNextHashPos(LogDebugEntryTable, Pos, &HKLen, &ch, &vptr)) {
-               LogDebugEntry *E = (LogDebugEntry*)vptr;
-               cprintf("%s|%d\n", ch, *E->LogP);
-       }
-       
-       DeleteHashPos(&Pos);
-       cprintf("000\n");
-}
-void cmd_log_set(char *argbuf)
-{
-       void *vptr;
-       int lset;
-       int wlen;
-       char which[SIZ] = "";
-
-       if (CtdlAccessCheck(ac_aide)) return;
-
-       wlen = extract_token(which, argbuf, 0, '|', sizeof(which));
-       if (wlen < 0) wlen = 0;
-       lset = extract_int(argbuf, 1);
-       if (lset != 0) lset = 1;
-       if (GetHash(LogDebugEntryTable, which, wlen, &vptr) && 
-           (vptr != NULL))
-       {
-               LogDebugEntry *E = (LogDebugEntry*)vptr;
-               E->F(lset);
-               cprintf("%d %s|%d\n", CIT_OK, which, lset);
-       }
-       else {
-               cprintf("%d Log setting %s not known\n", 
-                       ERROR, which);
-       }
-}
 void CtdlDestroyDebugTable(void)
 {
 
@@ -493,20 +426,29 @@ void CtdlRegisterCleanupHook(void (*fcn_ptr) (void))
 
 void CtdlUnregisterCleanupHook(void (*fcn_ptr) (void))
 {
-       CleanupFunctionHook *cur, *p;
-
-       for (cur = CleanupHookTable; cur != NULL; cur = cur->next) {
-               /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               fcn_ptr == cur->h_function_pointer) {
+       CleanupFunctionHook *cur, *p, *last;
+       last = NULL;
+       cur = CleanupHookTable;
+       while (cur != NULL)
+       {
+               if (fcn_ptr == cur->h_function_pointer)
+               {
                        MODM_syslog(LOG_DEBUG, "Unregistered cleanup function\n");
                        p = cur->next;
-                       if (cur == CleanupHookTable) {
-                               CleanupHookTable = p;
-                       }
+
                        free(cur);
+                       cur = NULL;
+
+                       if (last != NULL)
+                               last->next = p;
+                       else 
+                               CleanupHookTable = p;
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
@@ -543,20 +485,29 @@ void CtdlRegisterEVCleanupHook(void (*fcn_ptr) (void))
 
 void CtdlUnregisterEVCleanupHook(void (*fcn_ptr) (void))
 {
-       CleanupFunctionHook *cur, *p;
-
-       for (cur = EVCleanupHookTable; cur != NULL; cur = cur->next) {
-               /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               fcn_ptr == cur->h_function_pointer) {
+       CleanupFunctionHook *cur, *p, *last;
+       last = NULL;
+       cur = EVCleanupHookTable;
+       while (cur != NULL)
+       {
+               if (fcn_ptr == cur->h_function_pointer)
+               {
                        MODM_syslog(LOG_DEBUG, "Unregistered cleanup function\n");
                        p = cur->next;
-                       if (cur == EVCleanupHookTable) {
-                               EVCleanupHookTable = p;
-                       }
+
                        free(cur);
+                       cur = NULL;
+
+                       if (last != NULL)
+                               last->next = p;
+                       else 
+                               EVCleanupHookTable = p;
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
@@ -570,48 +521,134 @@ void CtdlDestroyEVCleanupHooks(void)
        {
                MODM_syslog(LOG_DEBUG, "Destroyed cleanup function\n");
                p = cur->next;
+               cur->h_function_pointer();
                free(cur);
                cur = p;
        }
        EVCleanupHookTable = NULL;
 }
 
+void CtdlRegisterTDAPVetoHook(int (*fcn_ptr) (StrBuf*), int EventType, int Priority)
+{
+       TDAPVetoHookFunctionHook *newfcn;
+
+       newfcn = (TDAPVetoHookFunctionHook *)
+           malloc(sizeof(TDAPVetoHookFunctionHook));
+       newfcn->Priority = Priority;
+       newfcn->h_function_pointer = fcn_ptr;
+       newfcn->eventtype = EventType;
+
+       TDAPVetoHookFunctionHook **pfcn;
+       pfcn = &TDAPVetoHookTable;
+       while ((*pfcn != NULL) && 
+              ((*pfcn)->Priority < newfcn->Priority) &&
+              ((*pfcn)->next != NULL))
+               pfcn = &(*pfcn)->next;
+               
+       newfcn->next = *pfcn;
+       *pfcn = newfcn;
+       
+       MOD_syslog(LOG_DEBUG, "Registered a new TDAP Veto function (type %d Priority %d)\n",
+                  EventType, Priority);
+}
+
+
+void CtdlUnregisterTDAPVetoHook(int (*fcn_ptr) (StrBuf*), int EventType)
+{
+       TDAPVetoHookFunctionHook *cur, *p, *last;
+       last = NULL;
+       cur = TDAPVetoHookTable;
+       while  (cur != NULL) {
+               if ((fcn_ptr == cur->h_function_pointer) &&
+                   (EventType == cur->eventtype))
+               {
+                       MOD_syslog(LOG_DEBUG, "Unregistered TDAP Veto function (type %d)\n",
+                                  EventType);
+                       p = cur->next;
+
+                       free(cur);
+                       cur = NULL;
 
-void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType)
+                       if (last != NULL)
+                               last->next = p;
+                       else 
+                               TDAPVetoHookTable = p;
+                       cur = p;
+               }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
+       }
+}
+
+void CtdlDestroyTDAPVetoHooks(void)
 {
+       TDAPVetoHookFunctionHook *cur, *p;
+
+       cur = TDAPVetoHookTable;
+       while (cur != NULL)
+       {
+               MODM_syslog(LOG_DEBUG, "Destroyed TDAP Veto function\n");
+               p = cur->next;
+               free(cur);
+               cur = p;
+       }
+       TDAPVetoHookTable = NULL;
+}
+
 
+void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType, int Priority)
+{
        SessionFunctionHook *newfcn;
 
        newfcn = (SessionFunctionHook *)
            malloc(sizeof(SessionFunctionHook));
-       newfcn->next = SessionHookTable;
+       newfcn->Priority = Priority;
        newfcn->h_function_pointer = fcn_ptr;
        newfcn->eventtype = EventType;
-       SessionHookTable = newfcn;
 
-       MOD_syslog(LOG_DEBUG, "Registered a new session function (type %d)\n",
-                  EventType);
+       SessionFunctionHook **pfcn;
+       pfcn = &SessionHookTable;
+       while ((*pfcn != NULL) && 
+              ((*pfcn)->Priority < newfcn->Priority) &&
+              ((*pfcn)->next != NULL))
+               pfcn = &(*pfcn)->next;
+               
+       newfcn->next = *pfcn;
+       *pfcn = newfcn;
+       
+       MOD_syslog(LOG_DEBUG, "Registered a new session function (type %d Priority %d)\n",
+                  EventType, Priority);
 }
 
 
 void CtdlUnregisterSessionHook(void (*fcn_ptr) (void), int EventType)
 {
-       SessionFunctionHook *cur, *p;
-
-       for (cur = SessionHookTable; cur != NULL; cur = cur->next) {
-               /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               fcn_ptr == cur->h_function_pointer &&
-                               EventType == cur->eventtype) {
+       SessionFunctionHook *cur, *p, *last;
+       last = NULL;
+       cur = SessionHookTable;
+       while  (cur != NULL) {
+               if ((fcn_ptr == cur->h_function_pointer) &&
+                   (EventType == cur->eventtype))
+               {
                        MOD_syslog(LOG_DEBUG, "Unregistered session function (type %d)\n",
                                   EventType);
                        p = cur->next;
-                       if (cur == SessionHookTable) {
-                               SessionHookTable = p;
-                       }
+
                        free(cur);
+                       cur = NULL;
+
+                       if (last != NULL)
+                               last->next = p;
+                       else 
+                               SessionHookTable = p;
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
@@ -650,22 +687,30 @@ void CtdlRegisterUserHook(void (*fcn_ptr) (ctdluser *), int EventType)
 
 void CtdlUnregisterUserHook(void (*fcn_ptr) (struct ctdluser *), int EventType)
 {
-       UserFunctionHook *cur, *p;
-
-       for (cur = UserHookTable; cur != NULL; cur = cur->next) {
-               /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               fcn_ptr == cur->h_function_pointer &&
-                               EventType == cur->eventtype) {
+       UserFunctionHook *cur, *p, *last;
+       last = NULL;
+       cur = UserHookTable;
+       while (cur != NULL) {
+               if ((fcn_ptr == cur->h_function_pointer) &&
+                   (EventType == cur->eventtype))
+               {
                        MOD_syslog(LOG_DEBUG, "Unregistered user function (type %d)\n",
                                   EventType);
                        p = cur->next;
-                       if (cur == UserHookTable) {
-                               UserHookTable = p;
-                       }
+
                        free(cur);
+                       cur = NULL;
+
+                       if (last != NULL)
+                               last->next = p;
+                       else 
+                               UserHookTable = p;
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
@@ -685,7 +730,7 @@ void CtdlDestroyUserHooks(void)
 }
 
 
-void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *),
+void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *),
                                int EventType)
 {
 
@@ -703,25 +748,32 @@ void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *),
 }
 
 
-void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *),
+void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *),
                int EventType)
 {
-       MessageFunctionHook *cur, *p;
-
-       for (cur = MessageHookTable; cur != NULL; cur = cur->next) {
-               /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               handler == cur->h_function_pointer &&
-                               EventType == cur->eventtype) {
+       MessageFunctionHook *cur, *p, *last;
+       last = NULL;
+       cur = MessageHookTable;
+       while (cur != NULL) {
+               if ((handler == cur->h_function_pointer) &&
+                   (EventType == cur->eventtype))
+               {
                        MOD_syslog(LOG_DEBUG, "Unregistered message function (type %d)\n",
                                   EventType);
                        p = cur->next;
-                       if (cur == MessageHookTable) {
-                               MessageHookTable = p;
-                       }
                        free(cur);
+                       cur = NULL;
+
+                       if (last != NULL)
+                               last->next = p;
+                       else 
+                               MessageHookTable = p;
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
@@ -775,10 +827,10 @@ void CtdlUnregisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
                                RoomHookTable = p;
                        cur = p;
                }
-               last = cur;
-               if (cur != NULL)
+               else {
+                       last = cur;
                        cur = cur->next;
-
+               }
        }
 }
 
@@ -814,20 +866,29 @@ void CtdlRegisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
 
 void CtdlUnregisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
 {
-       NetprocFunctionHook *cur, *p;
+       NetprocFunctionHook *cur, *p, *last;
 
-       for (cur = NetprocHookTable; cur != NULL; cur = cur->next) {
-               /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               handler == cur->h_function_pointer ) {
+       cur = NetprocHookTable;
+       last = NULL;
+
+       while (cur != NULL) {
+               if (handler == cur->h_function_pointer)
+               {
                        MODM_syslog(LOG_DEBUG, "Unregistered netproc function\n");
                        p = cur->next;
-                       if (cur == NetprocHookTable) {
+                       free(cur);
+                       if (last != NULL) {
+                               last->next = p;
+                       }
+                       else {
                                NetprocHookTable = p;
                        }
-                       free(cur);
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
@@ -863,20 +924,28 @@ void CtdlRegisterDeleteHook(void (*handler)(char *, long) )
 
 void CtdlUnregisterDeleteHook(void (*handler)(char *, long) )
 {
-       DeleteFunctionHook *cur, *p;
+       DeleteFunctionHook *cur, *p, *last;
 
-       for (cur = DeleteHookTable; cur != NULL; cur = cur->next) {
-               /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               handler == cur->h_function_pointer ) {
+       last = NULL;
+       cur = DeleteHookTable;
+       while (cur != NULL) {
+               if (handler == cur->h_function_pointer )
+               {
                        MODM_syslog(LOG_DEBUG, "Unregistered delete function\n");
                        p = cur->next;
-                       if (cur == DeleteHookTable) {
-                               DeleteHookTable = p;
-                       }
                        free(cur);
+
+                       if (last != NULL)
+                               last->next = p;
+                       else
+                               DeleteHookTable = p;
+
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 void CtdlDestroyDeleteHooks(void)
@@ -914,19 +983,32 @@ void CtdlRegisterFixedOutputHook(char *content_type, void (*handler)(char *, int
 
 void CtdlUnregisterFixedOutputHook(char *content_type)
 {
-       FixedOutputHook *cur, *p;
+       FixedOutputHook *cur, *p, *last;
 
-       for (cur = FixedOutputTable; cur != NULL; cur = cur->next) {
+       last = NULL;
+       cur = FixedOutputTable;
+       while (cur != NULL) {
                /* This will also remove duplicates if any */
-               while (cur != NULL && (!strcasecmp(content_type, cur->content_type))) {
-                       MOD_syslog(LOG_DEBUG, "Unregistered fixed output function for %s\n", content_type);
+               if (!strcasecmp(content_type, cur->content_type)) {
+                       MOD_syslog(LOG_DEBUG,
+                                  "Unregistered fixed output function for %s\n",
+                                  content_type);
+
                        p = cur->next;
-                       if (cur == FixedOutputTable) {
-                               FixedOutputTable = p;
-                       }
                        free(cur);
+
+                       if (last != NULL)
+                               last->next = p;
+                       else
+                               FixedOutputTable = p;
+                       
                        cur = p;
                }
+               else
+               {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
@@ -980,22 +1062,30 @@ void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int o
 
 void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int order)
 {
-       XmsgFunctionHook *cur, *p;
+       XmsgFunctionHook *cur, *p, *last;
 
-       for (cur = XmsgHookTable; cur != NULL; cur = cur->next) {
+       last = NULL;
+       cur = XmsgHookTable;
+       while (cur != NULL) {
                /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               fcn_ptr == cur->h_function_pointer &&
-                               order == cur->order) {
+               if (fcn_ptr == cur->h_function_pointer &&
+                   order == cur->order) {
                        MOD_syslog(LOG_DEBUG, "Unregistered x-msg function "
                                   "(priority %d)\n", order);
                        p = cur->next;
-                       if (cur == XmsgHookTable) {
-                               XmsgHookTable = p;
-                       }
                        free(cur);
+
+                       if (last != NULL)
+                               last->next = p;
+                       else
+                               XmsgHookTable = p;
+                       
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
@@ -1080,19 +1170,20 @@ void CtdlUnregisterServiceHook(int tcp_port, char *sockpath,
                        void (*h_async_function) (void)
                        )
 {
-       ServiceFunctionHook *cur, *p;
+       ServiceFunctionHook *cur, *p, *last;
 
+       last = NULL;
        cur = ServiceHookTable;
        while (cur != NULL) {
                /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               !(sockpath && cur->sockpath &&
-                                       strcmp(sockpath, cur->sockpath)) &&
-                               h_greeting_function == cur->h_greeting_function &&
-                               h_command_function == cur->h_command_function &&
-                               h_async_function == cur->h_async_function &&
-                               tcp_port == cur->tcp_port) {
-                       close(cur->msock);
+               if (h_greeting_function == cur->h_greeting_function &&
+                   h_command_function == cur->h_command_function &&
+                   h_async_function == cur->h_async_function &&
+                   tcp_port == cur->tcp_port && 
+                   !(sockpath && cur->sockpath && strcmp(sockpath, cur->sockpath)) )
+               {
+                       if (cur->msock > 0)
+                               close(cur->msock);
                        if (sockpath) {
                                MOD_syslog(LOG_INFO, "Closed UNIX domain socket %s\n",
                                           sockpath);
@@ -1103,12 +1194,17 @@ void CtdlUnregisterServiceHook(int tcp_port, char *sockpath,
                                MOD_syslog(LOG_INFO, "Unregistered service \"%s\"\n", cur->ServiceName);
                        }
                        p = cur->next;
-                       if (cur == ServiceHookTable) {
-                               ServiceHookTable = p;
-                       }
                        free(cur);
+                       if (last != NULL)
+                               last->next = p;
+                       else
+                               ServiceHookTable = p;
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
@@ -1141,18 +1237,29 @@ void CtdlShutdownServiceHooks(void)
 
 void CtdlDestroyServiceHook(void)
 {
+       const char *Text;
        ServiceFunctionHook *cur, *p;
 
        cur = ServiceHookTable;
        while (cur != NULL)
        {
-               close(cur->msock);
+               if (cur->msock != -1)
+               {
+                       close(cur->msock);
+                       Text = "Closed";
+               }
+               else
+               {
+                       Text = " Not closing again";
+               }
+
                if (cur->sockpath) {
-                       MOD_syslog(LOG_INFO, "Closed UNIX domain socket %s\n",
+                       MOD_syslog(LOG_INFO, "%s UNIX domain socket %s\n",
+                                  Text,
                                   cur->sockpath);
                        unlink(cur->sockpath);
                } else if (cur->tcp_port) {
-                       MOD_syslog(LOG_INFO, "Closed TCP port %d\n", cur->tcp_port);
+                       MOD_syslog(LOG_INFO, "%s TCP port %d\n", Text, cur->tcp_port);
                } else {
                        MOD_syslog(LOG_INFO, "Destroyed service \"%s\"\n", cur->ServiceName);
                }
@@ -1183,18 +1290,28 @@ void CtdlRegisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), c
 
 void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), char *name)
 {
-       SearchFunctionHook *cur, *p;
+       SearchFunctionHook *cur, *p, *last;
        
-       for (cur = SearchFunctionHookTable; cur != NULL; cur = cur->next) {
-               while (fcn_ptr && (cur->fcn_ptr == fcn_ptr) && name && !strcmp(name, cur->name)) {
+       last = NULL;
+       cur = SearchFunctionHookTable;
+       while (cur != NULL) {
+               if (fcn_ptr &&
+                   (cur->fcn_ptr == fcn_ptr) &&
+                   name && !strcmp(name, cur->name))
+               {
                        MOD_syslog(LOG_DEBUG, "Unregistered search function(%s)\n", name);
                        p = cur->next;
-                       if (cur == SearchFunctionHookTable) {
-                               SearchFunctionHookTable = p;
-                       }
                        free (cur);
+                       if (last != NULL)
+                               last->next = p;
+                       else
+                               SearchFunctionHookTable = p;
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
@@ -1224,6 +1341,18 @@ void CtdlModuleDoSearch(int *num_msgs, long **search_msgs, const char *search_st
        *num_msgs = 0;
 }
 
+int CheckTDAPVeto (int DBType, StrBuf *ErrMsg)
+{
+       int Result = 0;
+       TDAPVetoHookFunctionHook *fcn = NULL;
+
+       for (fcn = TDAPVetoHookTable; (fcn != NULL) && (Result == 0); fcn = fcn->next) {
+               if (fcn->eventtype == DBType) {
+                       Result = (*fcn->h_function_pointer) (ErrMsg);
+               }
+       }
+       return Result;
+}
 
 void PerformSessionHooks(int EventType)
 {
@@ -1250,7 +1379,7 @@ void PerformUserHooks(ctdluser *usbuf, int EventType)
        }
 }
 
-int PerformMessageHooks(struct CtdlMessage *msg, int EventType)
+int PerformMessageHooks(struct CtdlMessage *msg, recptypes *recps, int EventType)
 {
        MessageFunctionHook *fcn = NULL;
        int total_retval = 0;
@@ -1268,7 +1397,7 @@ int PerformMessageHooks(struct CtdlMessage *msg, int EventType)
         */
        for (fcn = MessageHookTable; fcn != NULL; fcn = fcn->next) {
                if (fcn->eventtype == EventType) {
-                       total_retval = total_retval + (*fcn->h_function_pointer) (msg);
+                       total_retval = total_retval + (*fcn->h_function_pointer) (msg, recps);
                }
        }
 
@@ -1370,9 +1499,6 @@ CTDL_MODULE_INIT(modules)
 {
        if (!threading) {
                CtdlRegisterDebugFlagHook(HKEY("modules"), DebugModulesEnable, &DebugModules);
-
-               CtdlRegisterProtoHook(cmd_log_get, "LOGP", "Print Log-parameters");
-               CtdlRegisterProtoHook(cmd_log_set, "LOGS", "Set Log-parameters");
        }
        return "modules";
 }