projects / citadel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
These hooks are not needed when running single threaded
[citadel.git] / citadel / serv_extensions.c
diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c
index f4a963cf7bf9ad2c124449ad8e7b9103dbaffafe..897f43c1b74cef4e9f59e675f383c2aa95f71ca5 100644 (file)
--- a/citadel/serv_extensions.c
+++ b/citadel/serv_extensions.c
@@ -2,7 +2,7 @@
  * Citadel Extension Loader
  * Written by Brian Costello <btx@calyx.net>
  *
- * Copyright (c) 1987-2015 by the citadel.org team
+ * Copyright (c) 1987-2017 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, version 3.
@@ -53,19 +53,6 @@ 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;
 
 
 
@@ -259,8 +246,8 @@ void LogPrintMessages(long err)
        StrBufAppendBufPlain(Message, HKEY("\n\n"), 0);
        StrBufAppendBufPlain(Message, CKEY(ErrGeneral[3]), 0);
 
-       MOD_syslog(LOG_EMERG, "%s", ChrPtr(Message));
-       MOD_syslog(LOG_EMERG, "%s", ErrSubject);
+       syslog(LOG_EMERG, "extensions: %s", ChrPtr(Message));
+       syslog(LOG_EMERG, "extensions: %s", ErrSubject);
        quickie_message("Citadel", NULL, NULL, AIDEROOM, ChrPtr(Message), FMT_FIXED, ErrSubject);
 
        FreeStrBuf(&Message);
@@ -386,7 +373,7 @@ void CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc)
        p->desc = desc;
 
        Put(ProtoHookList, cmd, 4, p, NULL);
-       MOD_syslog(LOG_DEBUG, "Registered server command %s (%s)\n", cmd, desc);
+       syslog(LOG_DEBUG, "extensions: registered server command %s (%s)", cmd, desc);
 }
 
 void CtdlDestroyProtoHooks(void)
@@ -407,7 +394,7 @@ void CtdlRegisterCleanupHook(void (*fcn_ptr) (void))
        newfcn->h_function_pointer = fcn_ptr;
        CleanupHookTable = newfcn;
 
-       MODM_syslog(LOG_DEBUG, "Registered a new cleanup function\n");
+       syslog(LOG_DEBUG, "extensions: registered a new cleanup function");
 }
 
 
@@ -420,7 +407,7 @@ void CtdlUnregisterCleanupHook(void (*fcn_ptr) (void))
        {
                if (fcn_ptr == cur->h_function_pointer)
                {
-                       MODM_syslog(LOG_DEBUG, "Unregistered cleanup function\n");
+                       syslog(LOG_DEBUG, "extensions: unregistered cleanup function");
                        p = cur->next;
 
                        free(cur);
@@ -447,7 +434,7 @@ void CtdlDestroyCleanupHooks(void)
        cur = CleanupHookTable;
        while (cur != NULL)
        {
-               MODM_syslog(LOG_DEBUG, "Destroyed cleanup function\n");
+               syslog(LOG_DEBUG, "extensions: destroyed cleanup function");
                p = cur->next;
                free(cur);
                cur = p;
@@ -466,7 +453,7 @@ void CtdlRegisterEVCleanupHook(void (*fcn_ptr) (void))
        newfcn->h_function_pointer = fcn_ptr;
        EVCleanupHookTable = newfcn;
 
-       MODM_syslog(LOG_DEBUG, "Registered a new cleanup function\n");
+       syslog(LOG_DEBUG, "extensions: registered a new cleanup function");
 }
 
 
@@ -479,7 +466,7 @@ void CtdlUnregisterEVCleanupHook(void (*fcn_ptr) (void))
        {
                if (fcn_ptr == cur->h_function_pointer)
                {
-                       MODM_syslog(LOG_DEBUG, "Unregistered cleanup function\n");
+                       syslog(LOG_DEBUG, "extensions: unregistered cleanup function");
                        p = cur->next;
 
                        free(cur);
@@ -506,7 +493,7 @@ void CtdlDestroyEVCleanupHooks(void)
        cur = EVCleanupHookTable;
        while (cur != NULL)
        {
-               MODM_syslog(LOG_DEBUG, "Destroyed cleanup function\n");
+               syslog(LOG_DEBUG, "extensions: destroyed cleanup function");
                p = cur->next;
                cur->h_function_pointer();
                free(cur);
@@ -515,74 +502,7 @@ void CtdlDestroyEVCleanupHooks(void)
        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;
-
-                       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)
@@ -605,8 +525,7 @@ void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType, int Priority
        newfcn->next = *pfcn;
        *pfcn = newfcn;
        
-       MOD_syslog(LOG_DEBUG, "Registered a new session function (type %d Priority %d)\n",
-                  EventType, Priority);
+       syslog(LOG_DEBUG, "extensions: registered a new session function (type %d Priority %d)", EventType, Priority);
 }
 
 
@@ -619,8 +538,7 @@ void CtdlUnregisterSessionHook(void (*fcn_ptr) (void), int EventType)
                if ((fcn_ptr == cur->h_function_pointer) &&
                    (EventType == cur->eventtype))
                {
-                       MOD_syslog(LOG_DEBUG, "Unregistered session function (type %d)\n",
-                                  EventType);
+                       syslog(LOG_DEBUG, "extensions: unregistered session function (type %d)", EventType);
                        p = cur->next;
 
                        free(cur);
@@ -646,7 +564,7 @@ void CtdlDestroySessionHooks(void)
        cur = SessionHookTable;
        while (cur != NULL)
        {
-               MODM_syslog(LOG_DEBUG, "Destroyed session function\n");
+               syslog(LOG_DEBUG, "extensions: destroyed session function");
                p = cur->next;
                free(cur);
                cur = p;
@@ -667,7 +585,7 @@ void CtdlRegisterUserHook(void (*fcn_ptr) (ctdluser *), int EventType)
        newfcn->eventtype = EventType;
        UserHookTable = newfcn;
 
-       MOD_syslog(LOG_DEBUG, "Registered a new user function (type %d)\n",
+       syslog(LOG_DEBUG, "extensions: registered a new user function (type %d)",
                   EventType);
 }
 
@@ -681,8 +599,7 @@ void CtdlUnregisterUserHook(void (*fcn_ptr) (struct ctdluser *), int EventType)
                if ((fcn_ptr == cur->h_function_pointer) &&
                    (EventType == cur->eventtype))
                {
-                       MOD_syslog(LOG_DEBUG, "Unregistered user function (type %d)\n",
-                                  EventType);
+                       syslog(LOG_DEBUG, "extensions: unregistered user function (type %d)", EventType);
                        p = cur->next;
 
                        free(cur);
@@ -708,7 +625,7 @@ void CtdlDestroyUserHooks(void)
        cur = UserHookTable;
        while (cur != NULL)
        {
-               MODM_syslog(LOG_DEBUG, "Destroyed user function \n");
+               syslog(LOG_DEBUG, "extensions: destroyed user function");
                p = cur->next;
                free(cur);
                cur = p;
@@ -730,8 +647,7 @@ void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *),
        newfcn->eventtype = EventType;
        MessageHookTable = newfcn;
 
-       MOD_syslog(LOG_DEBUG, "Registered a new message function (type %d)\n",
-                  EventType);
+       syslog(LOG_DEBUG, "extensions: registered a new message function (type %d)", EventType);
 }
 
 
@@ -745,8 +661,7 @@ void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *)
                if ((handler == cur->h_function_pointer) &&
                    (EventType == cur->eventtype))
                {
-                       MOD_syslog(LOG_DEBUG, "Unregistered message function (type %d)\n",
-                                  EventType);
+                       syslog(LOG_DEBUG, "extensions: unregistered message function (type %d)", EventType);
                        p = cur->next;
                        free(cur);
                        cur = NULL;
@@ -771,7 +686,7 @@ void CtdlDestroyMessageHook(void)
        cur = MessageHookTable; 
        while (cur != NULL)
        {
-               MOD_syslog(LOG_DEBUG, "Destroyed message function (type %d)\n", cur->eventtype);
+               syslog(LOG_DEBUG, "extensions: destroyed message function (type %d)", cur->eventtype);
                p = cur->next;
                free(cur);
                cur = p;
@@ -790,7 +705,7 @@ void CtdlRegisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
        newfcn->fcn_ptr = fcn_ptr;
        RoomHookTable = newfcn;
 
-       MODM_syslog(LOG_DEBUG, "Registered a new room function\n");
+       syslog(LOG_DEBUG, "extensions: registered a new room function");
 }
 
 
@@ -802,7 +717,7 @@ void CtdlUnregisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
        while (cur != NULL)
        {
                if (fcn_ptr == cur->fcn_ptr) {
-                       MODM_syslog(LOG_DEBUG, "Unregistered room function\n");
+                       syslog(LOG_DEBUG, "extensions: unregistered room function");
                        p = cur->next;
 
                        free(cur);
@@ -829,7 +744,7 @@ void CtdlDestroyRoomHooks(void)
        cur = RoomHookTable;
        while (cur != NULL)
        {
-               MODM_syslog(LOG_DEBUG, "Destroyed room function\n");
+               syslog(LOG_DEBUG, "extensions: destroyed room function");
                p = cur->next;
                free(cur);
                cur = p;
@@ -847,7 +762,7 @@ void CtdlRegisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
        newfcn->h_function_pointer = handler;
        NetprocHookTable = newfcn;
 
-       MODM_syslog(LOG_DEBUG, "Registered a new netproc function\n");
+       syslog(LOG_DEBUG, "extensions: registered a new netproc function");
 }
 
 
@@ -861,7 +776,7 @@ void CtdlUnregisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
        while (cur != NULL) {
                if (handler == cur->h_function_pointer)
                {
-                       MODM_syslog(LOG_DEBUG, "Unregistered netproc function\n");
+                       syslog(LOG_DEBUG, "extensions: unregistered netproc function");
                        p = cur->next;
                        free(cur);
                        if (last != NULL) {
@@ -886,7 +801,7 @@ void CtdlDestroyNetprocHooks(void)
        cur = NetprocHookTable;
        while (cur != NULL)
        {
-               MODM_syslog(LOG_DEBUG, "Destroyed netproc function\n");
+               syslog(LOG_DEBUG, "extensions: destroyed netproc function");
                p = cur->next;
                free(cur);
                cur = p;
@@ -905,7 +820,7 @@ void CtdlRegisterDeleteHook(void (*handler)(char *, long) )
        newfcn->h_function_pointer = handler;
        DeleteHookTable = newfcn;
 
-       MODM_syslog(LOG_DEBUG, "Registered a new delete function\n");
+       syslog(LOG_DEBUG, "extensions: registered a new delete function");
 }
 
 
@@ -918,7 +833,7 @@ void CtdlUnregisterDeleteHook(void (*handler)(char *, long) )
        while (cur != NULL) {
                if (handler == cur->h_function_pointer )
                {
-                       MODM_syslog(LOG_DEBUG, "Unregistered delete function\n");
+                       syslog(LOG_DEBUG, "extensions: unregistered delete function");
                        p = cur->next;
                        free(cur);
 
@@ -935,6 +850,8 @@ void CtdlUnregisterDeleteHook(void (*handler)(char *, long) )
                }
        }
 }
+
+
 void CtdlDestroyDeleteHooks(void)
 {
        DeleteFunctionHook *cur, *p;
@@ -942,7 +859,7 @@ void CtdlDestroyDeleteHooks(void)
        cur = DeleteHookTable;
        while (cur != NULL)
        {
-               MODM_syslog(LOG_DEBUG, "Destroyed delete function\n");
+               syslog(LOG_DEBUG, "extensions: destroyed delete function");
                p = cur->next;
                free(cur);
                cur = p;                
@@ -951,8 +868,6 @@ void CtdlDestroyDeleteHooks(void)
 }
 
 
-
-
 void CtdlRegisterFixedOutputHook(char *content_type, void (*handler)(char *, int) )
 {
        FixedOutputHook *newfcn;
@@ -964,7 +879,7 @@ void CtdlRegisterFixedOutputHook(char *content_type, void (*handler)(char *, int
        safestrncpy(newfcn->content_type, content_type, sizeof newfcn->content_type);
        FixedOutputTable = newfcn;
 
-       MOD_syslog(LOG_DEBUG, "Registered a new fixed output function for %s\n", newfcn->content_type);
+       syslog(LOG_DEBUG, "extensions: registered a new fixed output function for %s", newfcn->content_type);
 }
 
 
@@ -977,10 +892,7 @@ void CtdlUnregisterFixedOutputHook(char *content_type)
        while (cur != NULL) {
                /* This will also remove duplicates if any */
                if (!strcasecmp(content_type, cur->content_type)) {
-                       MOD_syslog(LOG_DEBUG,
-                                  "Unregistered fixed output function for %s\n",
-                                  content_type);
-
+                       syslog(LOG_DEBUG, "extensions: unregistered fixed output function for %s", content_type);
                        p = cur->next;
                        free(cur);
 
@@ -1006,7 +918,7 @@ void CtdlDestroyFixedOutputHooks(void)
        cur = FixedOutputTable; 
        while (cur != NULL)
        {
-               MOD_syslog(LOG_DEBUG, "Destroyed fixed output function for %s\n", cur->content_type);
+               syslog(LOG_DEBUG, "extensions: destroyed fixed output function for %s", cur->content_type);
                p = cur->next;
                free(cur);
                cur = p;
@@ -1030,9 +942,6 @@ int PerformFixedOutputHooks(char *content_type, char *content, int content_lengt
 }
 
 
-
-
-
 void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int order)
 {
 
@@ -1043,7 +952,7 @@ void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int o
        newfcn->order = order;
        newfcn->h_function_pointer = fcn_ptr;
        XmsgHookTable = newfcn;
-       MOD_syslog(LOG_DEBUG, "Registered a new x-msg function (priority %d)\n", order);
+       syslog(LOG_DEBUG, "extensions: registered a new x-msg function (priority %d)", order);
 }
 
 
@@ -1057,16 +966,16 @@ void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int
                /* This will also remove duplicates if any */
                if (fcn_ptr == cur->h_function_pointer &&
                    order == cur->order) {
-                       MOD_syslog(LOG_DEBUG, "Unregistered x-msg function "
-                                  "(priority %d)\n", order);
+                       syslog(LOG_DEBUG, "extensions: unregistered x-msg function (priority %d)", order);
                        p = cur->next;
                        free(cur);
 
-                       if (last != NULL)
+                       if (last != NULL) {
                                last->next = p;
-                       else
+                       }
+                       else {
                                XmsgHookTable = p;
-                       
+                       }
                        cur = p;
                }
                else {
@@ -1076,6 +985,7 @@ void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int
        }
 }
 
+
 void CtdlDestroyXmsgHooks(void)
 {
        XmsgFunctionHook *cur, *p;
@@ -1083,10 +993,8 @@ void CtdlDestroyXmsgHooks(void)
        cur = XmsgHookTable;
        while (cur != NULL)
        {
-               MOD_syslog(LOG_DEBUG, "Destroyed x-msg function "
-                       "(priority %d)\n", cur->order);
+               syslog(LOG_DEBUG, "extensions: destroyed x-msg function (priority %d)", cur->order);
                p = cur->next;
-                       
                free(cur);
                cur = p;
        }
@@ -1119,10 +1027,10 @@ void CtdlRegisterServiceHook(int tcp_port,
 
        if (sockpath != NULL) {
                newfcn->msock = ctdl_uds_server(sockpath, CtdlGetConfigInt("c_maxsessions"), error);
-               snprintf(message, SIZ, "Unix domain socket '%s': ", sockpath);
+               snprintf(message, SIZ, "extensions: unix domain socket '%s': ", sockpath);
        }
        else if (tcp_port <= 0) {       /* port -1 to disable */
-               MOD_syslog(LOG_INFO, "Service %s has been manually disabled, skipping\n", ServiceName);
+               syslog(LOG_INFO, "extensions: service %s has been manually disabled, skipping", ServiceName);
                free (message);
                free(newfcn);
                return;
@@ -1132,19 +1040,19 @@ void CtdlRegisterServiceHook(int tcp_port,
                                              tcp_port,
                                              CtdlGetConfigInt("c_maxsessions"), 
                                              error);
-               snprintf(message, SIZ, "TCP port %s:%d: (%s) ", 
+               snprintf(message, SIZ, "extensions: TCP port %s:%d: (%s) ", 
                         CtdlGetConfigStr("c_ip_addr"), tcp_port, ServiceName);
        }
 
        if (newfcn->msock > 0) {
                ServiceHookTable = newfcn;
                strcat(message, "registered.");
-               MOD_syslog(LOG_INFO, "%s\n", message);
+               syslog(LOG_INFO, "%s", message);
        }
        else {
                AddPortError(message, error);
                strcat(message, "FAILED.");
-               MOD_syslog(LOG_CRIT, "%s\n", message);
+               syslog(LOG_ERR, "%s", message);
                free(newfcn);
        }
        free(message);
@@ -1172,13 +1080,12 @@ void CtdlUnregisterServiceHook(int tcp_port, char *sockpath,
                        if (cur->msock > 0)
                                close(cur->msock);
                        if (sockpath) {
-                               MOD_syslog(LOG_INFO, "Closed UNIX domain socket %s\n",
-                                          sockpath);
+                               syslog(LOG_INFO, "extensions: closed UNIX domain socket %s", sockpath);
                                unlink(sockpath);
                        } else if (tcp_port) {
-                               MOD_syslog(LOG_INFO, "Closed TCP port %d\n", tcp_port);
+                               syslog(LOG_INFO, "extensions: closed TCP port %d", tcp_port);
                        } else {
-                               MOD_syslog(LOG_INFO, "Unregistered service \"%s\"\n", cur->ServiceName);
+                               syslog(LOG_INFO, "extensions: unregistered service \"%s\"", cur->ServiceName);
                        }
                        p = cur->next;
                        free(cur);
@@ -1209,19 +1116,17 @@ void CtdlShutdownServiceHooks(void)
                        close(cur->msock);
                        cur->msock = -1;
                        if (cur->sockpath != NULL){
-                               MOD_syslog(LOG_INFO, "[%s] Closed UNIX domain socket %s\n",
-                                          cur->ServiceName,
-                                          cur->sockpath);
+                               syslog(LOG_INFO, "extensions: [%s] Closed UNIX domain socket %s", cur->ServiceName, cur->sockpath);
                                unlink(cur->sockpath);
                        } else {
-                               MOD_syslog(LOG_INFO, "[%s] closing service\n", 
-                                          cur->ServiceName);
+                               syslog(LOG_INFO, "extensions: [%s] closing service", cur->ServiceName);
                        }
                }
                cur = cur->next;
        }
 }
 
+
 void CtdlDestroyServiceHook(void)
 {
        const char *Text;
@@ -1241,14 +1146,12 @@ void CtdlDestroyServiceHook(void)
                }
 
                if (cur->sockpath) {
-                       MOD_syslog(LOG_INFO, "%s UNIX domain socket %s\n",
-                                  Text,
-                                  cur->sockpath);
+                       syslog(LOG_INFO, "extensions: %s UNIX domain socket %s", Text, cur->sockpath);
                        unlink(cur->sockpath);
                } else if (cur->tcp_port) {
-                       MOD_syslog(LOG_INFO, "%s TCP port %d\n", Text, cur->tcp_port);
+                       syslog(LOG_INFO, "extensions: %s TCP port %d", Text, cur->tcp_port);
                } else {
-                       MOD_syslog(LOG_INFO, "Destroyed service \"%s\"\n", cur->ServiceName);
+                       syslog(LOG_INFO, "extensions: destroyed service \"%s\"", cur->ServiceName);
                }
                p = cur->next;
                free(cur);
@@ -1272,7 +1175,7 @@ void CtdlRegisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), c
        newfcn->fcn_ptr = fcn_ptr;
        SearchFunctionHookTable = newfcn;
 
-       MOD_syslog(LOG_DEBUG, "Registered a new search function (%s)\n", name);
+       syslog(LOG_DEBUG, "extensions: registered a new search function (%s)", name);
 }
 
 void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), char *name)
@@ -1286,7 +1189,7 @@ void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *),
                    (cur->fcn_ptr == fcn_ptr) &&
                    name && !strcmp(name, cur->name))
                {
-                       MOD_syslog(LOG_DEBUG, "Unregistered search function(%s)\n", name);
+                       syslog(LOG_DEBUG, "extensions: unregistered search function(%s)", name);
                        p = cur->next;
                        free (cur);
                        if (last != NULL)
@@ -1328,18 +1231,6 @@ 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)
 {
@@ -1373,10 +1264,8 @@ int PerformMessageHooks(struct CtdlMessage *msg, recptypes *recps, int EventType
 
        /* Other code may elect to protect this message from server-side
         * handlers; if this is the case, don't do anything.
-       MOD_syslog(LOG_DEBUG, "** Event type is %d, flags are %d\n", EventType, msg->cm_flags);
         */
        if (msg->cm_flags & CM_SKIP_HOOKS) {
-               MODM_syslog(LOG_DEBUG, "Skipping hooks\n");
                return(0);
        }
 
@@ -1401,7 +1290,7 @@ int PerformRoomHooks(struct ctdlroom *target_room)
        RoomFunctionHook *fcn;
        int total_retval = 0;
 
-       MOD_syslog(LOG_DEBUG, "Performing room hooks for <%s>\n", target_room->QRname);
+       syslog(LOG_DEBUG, "extensions: performing room hooks for <%s>", target_room->QRname);
 
        for (fcn = RoomHookTable; fcn != NULL; fcn = fcn->next) {
                total_retval = total_retval + (*fcn->fcn_ptr) (target_room);
Citadel server, clients, utilities