* give all commands their own function

[citadel.git] / citadel / serv_extensions.c

diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c
index e248d50a1ecb5edd677314a24ee35d444777859e..115b6769b32d98bf70e53940be8818cd810ed23f 100644 (file)
--- a/citadel/serv_extensions.c
+++ b/citadel/serv_extensions.c
@@ -42,15 +42,15 @@ struct DeleteFunctionHook *DeleteHookTable = NULL;
 struct ServiceFunctionHook *ServiceHookTable = NULL;
 struct FixedOutputHook *FixedOutputTable = NULL;
 struct RoomFunctionHook *RoomHookTable = NULL;
-struct MaintenanceThreadHook *MaintenanceThreadHookTable = NULL;
 struct SearchFunctionHook *SearchFunctionHookTable = NULL;
 
 struct ProtoFunctionHook {
        void (*handler) (char *cmdbuf);
-       char *cmd;
-       char *desc;
-       struct ProtoFunctionHook *next;
-} *ProtoHookList = NULL;
+       const char *cmd;
+       const char *desc;
+};
+
+HashList *ProtoHookList = NULL;
 
 
 struct DirectoryServiceHook {
@@ -102,6 +102,8 @@ void LogPrintMessages(long err)
        int n = nSizPort + nSizErrmsg + 5;
 
        Message = (char*) malloc(n * SIZ);
+       
+       DetailErrorFlags = DetailErrorFlags & ~err;
 
        switch (err)
        {
@@ -123,8 +125,8 @@ void LogPrintMessages(long err)
 
        snprintf(Message, n * SIZ, ErrGeneral, Short, Where, List, Hint, DetailList);
 
-       lprintf(0,Message);
-       lprintf(0,ErrSubject);
+       CtdlLogPrintf(0,Message);
+       CtdlLogPrintf(0,ErrSubject);
        quickie_message("Citadel", NULL, NULL, AIDEROOM, Message, FMT_FIXED, ErrSubject);
        if (errormessages!=NULL) free (errormessages);
        errormessages = NULL;
@@ -190,10 +192,39 @@ void AddPortError(char *Port, char *ErrorMessage)
 }
 
 
+int DLoader_Exec_Cmd(char *cmdbuf)
+{
+       void *vP;
+       struct ProtoFunctionHook *p;
+
+       if (GetHash(ProtoHookList, cmdbuf, 4, &vP) && (vP != NULL)) {
+               p = (struct ProtoFunctionHook*) vP;
+               p->handler(&cmdbuf[5]);
+               return 1;
+       }
+       return 0;
+}
+
+int FourHash(const char *key, long length) 
+{
+       int i;
+       int ret = 0;
+       const unsigned char *ptr = (const unsigned char*)key;
+
+       for (i = 0; i < 4; i++, ptr ++) 
+               ret = (ret << 8) | *ptr;
+
+       return ret;
+}
+
 void CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc)
 {
        struct ProtoFunctionHook *p;
 
+       if (ProtoHookList == NULL)
+               ProtoHookList = NewHash (1, FourHash);
+
+
        p = (struct ProtoFunctionHook *)
                malloc(sizeof(struct ProtoFunctionHook));
 
@@ -204,70 +235,15 @@ void CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc)
        p->handler = handler;
        p->cmd = cmd;
        p->desc = desc;
-       p->next = ProtoHookList;
-       ProtoHookList = p;
-       lprintf(CTDL_INFO, "Registered server command %s (%s)\n", cmd, desc);
-}
 
-
-void CtdlUnregisterProtoHook(void (*handler) (char *), char *cmd)
-{
-       struct ProtoFunctionHook *cur = NULL;
-       struct ProtoFunctionHook *p = NULL;
-       struct ProtoFunctionHook *lastcur = NULL;
-
-       for (cur = ProtoHookList; 
-            cur != NULL; 
-            cur = (cur != NULL)? cur->next: NULL) {
-               /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               handler == cur->handler &&
-                               !strcmp(cmd, cur->cmd)) {
-                       lprintf(CTDL_INFO, "Unregistered server command %s (%s)\n",
-                                       cmd, cur->desc);
-                       p = cur->next;
-                       if (cur == ProtoHookList) {
-                               ProtoHookList = p;
-                       }
-                       else if (lastcur != NULL)
-                       {
-                               lastcur->next = p;
-                       }
-                       free(cur);
-                       cur = p;
-               }
-               lastcur = cur;
-       }
+       Put(ProtoHookList, cmd, 4, p, NULL);
+       CtdlLogPrintf(CTDL_INFO, "Registered server command %s (%s)\n", cmd, desc);
 }
 
 void CtdlDestroyProtoHooks(void)
 {
-       struct ProtoFunctionHook *cur, *p;
-
-       cur = ProtoHookList; 
-       while (cur != NULL)
-       {
-               lprintf(CTDL_INFO, "Destroyed server command %s (%s)\n",
-                       cur->cmd, cur->desc);
-               p = cur->next;
-               free(cur);
-               cur = p;
-       }
-       ProtoHookList = NULL;
-}
-
-
-int DLoader_Exec_Cmd(char *cmdbuf)
-{
-       struct ProtoFunctionHook *p;
 
-       for (p = ProtoHookList; p; p = p->next) {
-               if (!strncasecmp(cmdbuf, p->cmd, 4)) {
-                       p->handler(&cmdbuf[5]);
-                       return 1;
-               }
-       }
-       return 0;
+       DeleteHash(&ProtoHookList);
 }
 
 
@@ -282,7 +258,7 @@ void CtdlRegisterCleanupHook(void (*fcn_ptr) (void))
        newfcn->h_function_pointer = fcn_ptr;
        CleanupHookTable = newfcn;
 
-       lprintf(CTDL_INFO, "Registered a new cleanup function\n");
+       CtdlLogPrintf(CTDL_INFO, "Registered a new cleanup function\n");
 }
 
 
@@ -294,7 +270,7 @@ void CtdlUnregisterCleanupHook(void (*fcn_ptr) (void))
                /* This will also remove duplicates if any */
                while (cur != NULL &&
                                fcn_ptr == cur->h_function_pointer) {
-                       lprintf(CTDL_INFO, "Unregistered cleanup function\n");
+                       CtdlLogPrintf(CTDL_INFO, "Unregistered cleanup function\n");
                        p = cur->next;
                        if (cur == CleanupHookTable) {
                                CleanupHookTable = p;
@@ -312,7 +288,7 @@ void CtdlDestroyCleanupHooks(void)
        cur = CleanupHookTable;
        while (cur != NULL)
        {
-               lprintf(CTDL_INFO, "Destroyed cleanup function\n");
+               CtdlLogPrintf(CTDL_INFO, "Destroyed cleanup function\n");
                p = cur->next;
                free(cur);
                cur = p;
@@ -333,7 +309,7 @@ void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType)
        newfcn->eventtype = EventType;
        SessionHookTable = newfcn;
 
-       lprintf(CTDL_INFO, "Registered a new session function (type %d)\n",
+       CtdlLogPrintf(CTDL_INFO, "Registered a new session function (type %d)\n",
                EventType);
 }
 
@@ -347,7 +323,7 @@ void CtdlUnregisterSessionHook(void (*fcn_ptr) (void), int EventType)
                while (cur != NULL &&
                                fcn_ptr == cur->h_function_pointer &&
                                EventType == cur->eventtype) {
-                       lprintf(CTDL_INFO, "Unregistered session function (type %d)\n",
+                       CtdlLogPrintf(CTDL_INFO, "Unregistered session function (type %d)\n",
                                        EventType);
                        p = cur->next;
                        if (cur == SessionHookTable) {
@@ -366,7 +342,7 @@ void CtdlDestroySessionHooks(void)
        cur = SessionHookTable;
        while (cur != NULL)
        {
-               lprintf(CTDL_INFO, "Destroyed session function\n");
+               CtdlLogPrintf(CTDL_INFO, "Destroyed session function\n");
                p = cur->next;
                free(cur);
                cur = p;
@@ -387,7 +363,7 @@ void CtdlRegisterUserHook(void (*fcn_ptr) (struct ctdluser *), int EventType)
        newfcn->eventtype = EventType;
        UserHookTable = newfcn;
 
-       lprintf(CTDL_INFO, "Registered a new user function (type %d)\n",
+       CtdlLogPrintf(CTDL_INFO, "Registered a new user function (type %d)\n",
                EventType);
 }
 
@@ -401,7 +377,7 @@ void CtdlUnregisterUserHook(void (*fcn_ptr) (struct ctdluser *), int EventType)
                while (cur != NULL &&
                                fcn_ptr == cur->h_function_pointer &&
                                EventType == cur->eventtype) {
-                       lprintf(CTDL_INFO, "Unregistered user function (type %d)\n",
+                       CtdlLogPrintf(CTDL_INFO, "Unregistered user function (type %d)\n",
                                        EventType);
                        p = cur->next;
                        if (cur == UserHookTable) {
@@ -420,7 +396,7 @@ void CtdlDestroyUserHooks(void)
        cur = UserHookTable;
        while (cur != NULL)
        {
-               lprintf(CTDL_INFO, "Destroyed user function \n");
+               CtdlLogPrintf(CTDL_INFO, "Destroyed user function \n");
                p = cur->next;
                free(cur);
                cur = p;
@@ -442,7 +418,7 @@ void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *),
        newfcn->eventtype = EventType;
        MessageHookTable = newfcn;
 
-       lprintf(CTDL_INFO, "Registered a new message function (type %d)\n",
+       CtdlLogPrintf(CTDL_INFO, "Registered a new message function (type %d)\n",
                EventType);
 }
 
@@ -457,7 +433,7 @@ void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *),
                while (cur != NULL &&
                                handler == cur->h_function_pointer &&
                                EventType == cur->eventtype) {
-                       lprintf(CTDL_INFO, "Unregistered message function (type %d)\n",
+                       CtdlLogPrintf(CTDL_INFO, "Unregistered message function (type %d)\n",
                                        EventType);
                        p = cur->next;
                        if (cur == MessageHookTable) {
@@ -476,7 +452,7 @@ void CtdlDestroyMessageHook(void)
        cur = MessageHookTable; 
        while (cur != NULL)
        {
-               lprintf(CTDL_INFO, "Destroyed message function \n");
+               CtdlLogPrintf(CTDL_INFO, "Destroyed message function (type %d)\n", cur->eventtype);
                p = cur->next;
                free(cur);
                cur = p;
@@ -495,7 +471,7 @@ void CtdlRegisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
        newfcn->fcn_ptr = fcn_ptr;
        RoomHookTable = newfcn;
 
-       lprintf(CTDL_INFO, "Registered a new room function\n");
+       CtdlLogPrintf(CTDL_INFO, "Registered a new room function\n");
 }
 
 
@@ -505,7 +481,7 @@ void CtdlUnregisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
 
        for (cur = RoomHookTable; cur != NULL; cur = cur->next) {
                while (cur != NULL && fcn_ptr == cur->fcn_ptr) {
-                       lprintf(CTDL_INFO, "Unregistered room function\n");
+                       CtdlLogPrintf(CTDL_INFO, "Unregistered room function\n");
                        p = cur->next;
                        if (cur == RoomHookTable) {
                                RoomHookTable = p;
@@ -524,7 +500,7 @@ void CtdlDestroyRoomHooks(void)
        cur = RoomHookTable;
        while (cur != NULL)
        {
-               lprintf(CTDL_INFO, "Unregistered room function\n");
+               CtdlLogPrintf(CTDL_INFO, "Destroyed room function\n");
                p = cur->next;
                free(cur);
                cur = p;
@@ -542,7 +518,7 @@ void CtdlRegisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
        newfcn->h_function_pointer = handler;
        NetprocHookTable = newfcn;
 
-       lprintf(CTDL_INFO, "Registered a new netproc function\n");
+       CtdlLogPrintf(CTDL_INFO, "Registered a new netproc function\n");
 }
 
 
@@ -554,7 +530,7 @@ void CtdlUnregisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
                /* This will also remove duplicates if any */
                while (cur != NULL &&
                                handler == cur->h_function_pointer ) {
-                       lprintf(CTDL_INFO, "Unregistered netproc function\n");
+                       CtdlLogPrintf(CTDL_INFO, "Unregistered netproc function\n");
                        p = cur->next;
                        if (cur == NetprocHookTable) {
                                NetprocHookTable = p;
@@ -572,7 +548,7 @@ void CtdlDestroyNetprocHooks(void)
        cur = NetprocHookTable;
        while (cur != NULL)
        {
-               lprintf(CTDL_INFO, "Unregistered netproc function\n");
+               CtdlLogPrintf(CTDL_INFO, "Destroyed netproc function\n");
                p = cur->next;
                free(cur);
                cur = p;
@@ -591,7 +567,7 @@ void CtdlRegisterDeleteHook(void (*handler)(char *, long) )
        newfcn->h_function_pointer = handler;
        DeleteHookTable = newfcn;
 
-       lprintf(CTDL_INFO, "Registered a new netproc function\n");
+       CtdlLogPrintf(CTDL_INFO, "Registered a new delete function\n");
 }
 
 
@@ -603,7 +579,7 @@ void CtdlUnregisterDeleteHook(void (*handler)(char *, long) )
                /* This will also remove duplicates if any */
                while (cur != NULL &&
                                handler == cur->h_function_pointer ) {
-                       lprintf(CTDL_INFO, "Unregistered netproc function\n");
+                       CtdlLogPrintf(CTDL_INFO, "Unregistered delete function\n");
                        p = cur->next;
                        if (cur == DeleteHookTable) {
                                DeleteHookTable = p;
@@ -620,7 +596,7 @@ void CtdlDestroyDeleteHooks(void)
        cur = DeleteHookTable;
        while (cur != NULL)
        {
-               lprintf(CTDL_INFO, "Destroyed netproc function\n");
+               CtdlLogPrintf(CTDL_INFO, "Destroyed delete function\n");
                p = cur->next;
                free(cur);
                cur = p;                
@@ -642,7 +618,7 @@ void CtdlRegisterFixedOutputHook(char *content_type, void (*handler)(char *, int
        safestrncpy(newfcn->content_type, content_type, sizeof newfcn->content_type);
        FixedOutputTable = newfcn;
 
-       lprintf(CTDL_INFO, "Registered a new fixed output function for %s\n", newfcn->content_type);
+       CtdlLogPrintf(CTDL_INFO, "Registered a new fixed output function for %s\n", newfcn->content_type);
 }
 
 
@@ -653,7 +629,7 @@ void CtdlUnregisterFixedOutputHook(char *content_type)
        for (cur = FixedOutputTable; cur != NULL; cur = cur->next) {
                /* This will also remove duplicates if any */
                while (cur != NULL && (!strcasecmp(content_type, cur->content_type))) {
-                       lprintf(CTDL_INFO, "Unregistered fixed output function for %s\n", content_type);
+                       CtdlLogPrintf(CTDL_INFO, "Unregistered fixed output function for %s\n", content_type);
                        p = cur->next;
                        if (cur == FixedOutputTable) {
                                FixedOutputTable = p;
@@ -671,7 +647,7 @@ void CtdlDestroyFixedOutputHooks(void)
        cur = FixedOutputTable; 
        while (cur != NULL)
        {
-               lprintf(CTDL_INFO, "Destroyed fixed output function for %s\n", cur->content_type);
+               CtdlLogPrintf(CTDL_INFO, "Destroyed fixed output function for %s\n", cur->content_type);
                p = cur->next;
                free(cur);
                cur = p;
@@ -698,22 +674,21 @@ int PerformFixedOutputHooks(char *content_type, char *content, int content_lengt
 
 
 
-void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *), int order)
+void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int order)
 {
 
        struct XmsgFunctionHook *newfcn;
 
-       newfcn = (struct XmsgFunctionHook *)
-           malloc(sizeof(struct XmsgFunctionHook));
+       newfcn = (struct XmsgFunctionHook *) malloc(sizeof(struct XmsgFunctionHook));
        newfcn->next = XmsgHookTable;
        newfcn->order = order;
        newfcn->h_function_pointer = fcn_ptr;
        XmsgHookTable = newfcn;
-       lprintf(CTDL_INFO, "Registered a new x-msg function (priority %d)\n", order);
+       CtdlLogPrintf(CTDL_INFO, "Registered a new x-msg function (priority %d)\n", order);
 }
 
 
-void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *), int order)
+void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int order)
 {
        struct XmsgFunctionHook *cur, *p;
 
@@ -722,7 +697,7 @@ void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *), int order)
                while (cur != NULL &&
                                fcn_ptr == cur->h_function_pointer &&
                                order == cur->order) {
-                       lprintf(CTDL_INFO, "Unregistered x-msg function "
+                       CtdlLogPrintf(CTDL_INFO, "Unregistered x-msg function "
                                        "(priority %d)\n", order);
                        p = cur->next;
                        if (cur == XmsgHookTable) {
@@ -741,7 +716,7 @@ void CtdlDestroyXmsgHooks(void)
        cur = XmsgHookTable;
        while (cur != NULL)
        {
-               lprintf(CTDL_INFO, "Destroyed x-msg function "
+               CtdlLogPrintf(CTDL_INFO, "Destroyed x-msg function "
                        "(priority %d)\n", cur->order);
                p = cur->next;
                        
@@ -781,7 +756,7 @@ void CtdlRegisterServiceHook(int tcp_port,
                snprintf(message, SIZ, "Unix domain socket '%s': ", sockpath);
        }
        else if (tcp_port <= 0) {       /* port -1 to disable */
-               lprintf(CTDL_INFO, "Service %s has been manually disabled, skipping\n", ServiceName);
+               CtdlLogPrintf(CTDL_INFO, "Service %s has been manually disabled, skipping\n", ServiceName);
                free (message);
                free(newfcn);
                return;
@@ -798,12 +773,12 @@ void CtdlRegisterServiceHook(int tcp_port,
        if (newfcn->msock > 0) {
                ServiceHookTable = newfcn;
                strcat(message, "registered.");
-               lprintf(CTDL_INFO, "%s\n", message);
+               CtdlLogPrintf(CTDL_INFO, "%s\n", message);
        }
        else {
                AddPortError(message, error);
                strcat(message, "FAILED.");
-               lprintf(CTDL_CRIT, "%s\n", message);
+               CtdlLogPrintf(CTDL_CRIT, "%s\n", message);
                free(error);
                free(newfcn);
        }
@@ -830,12 +805,12 @@ void CtdlUnregisterServiceHook(int tcp_port, char *sockpath,
                                tcp_port == cur->tcp_port) {
                        close(cur->msock);
                        if (sockpath) {
-                               lprintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
+                               CtdlLogPrintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
                                                sockpath);
                        } else if (tcp_port) {
-                               lprintf(CTDL_INFO, "Closed TCP port %d\n", tcp_port);
+                               CtdlLogPrintf(CTDL_INFO, "Closed TCP port %d\n", tcp_port);
                        } else {
-                               lprintf(CTDL_INFO, "Unregistered unknown service\n");
+                               CtdlLogPrintf(CTDL_INFO, "Unregistered service \"%s\"\n", cur->ServiceName);
                        }
                        p = cur->next;
                        if (cur == ServiceHookTable) {
@@ -856,12 +831,12 @@ void CtdlDestroyServiceHook(void)
        {
                close(cur->msock);
                if (cur->sockpath) {
-                       lprintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
+                       CtdlLogPrintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
                                cur->sockpath);
                } else if (cur->tcp_port) {
-                       lprintf(CTDL_INFO, "Closed TCP port %d\n", cur->tcp_port);
+                       CtdlLogPrintf(CTDL_INFO, "Closed TCP port %d\n", cur->tcp_port);
                } else {
-                       lprintf(CTDL_INFO, "Unregistered unknown service\n");
+                       CtdlLogPrintf(CTDL_INFO, "Destroyed service \"%s\"\n", cur->ServiceName);
                }
                p = cur->next;
                free(cur);
@@ -885,7 +860,7 @@ void CtdlRegisterSearchFuncHook(void (*fcn_ptr)(int *, long **, char *), char *n
        newfcn->fcn_ptr = fcn_ptr;
        SearchFunctionHookTable = newfcn;
 
-       lprintf(CTDL_INFO, "Registered a new search function (%s)\n", name);
+       CtdlLogPrintf(CTDL_INFO, "Registered a new search function (%s)\n", name);
 }
 
 void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, char *), char *name)
@@ -894,7 +869,7 @@ void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, char *), char
        
        for (cur = SearchFunctionHookTable; cur != NULL; cur = cur->next) {
                while (fcn_ptr && (cur->fcn_ptr == fcn_ptr) && name && !strcmp(name, cur->name)) {
-                       lprintf(CTDL_INFO, "Unregistered search function(%s)\n", name);
+                       CtdlLogPrintf(CTDL_INFO, "Unregistered search function(%s)\n", name);
                        p = cur->next;
                        if (cur == SearchFunctionHookTable) {
                                SearchFunctionHookTable = p;
@@ -948,11 +923,11 @@ int PerformMessageHooks(struct CtdlMessage *msg, int EventType)
 
        /* Other code may elect to protect this message from server-side
         * handlers; if this is the case, don't do anything.
-       lprintf(CTDL_DEBUG, "** Event type is %d, flags are %d\n",
+       CtdlLogPrintf(CTDL_DEBUG, "** Event type is %d, flags are %d\n",
                EventType, msg->cm_flags);
         */
        if (msg->cm_flags & CM_SKIP_HOOKS) {
-               lprintf(CTDL_DEBUG, "Skipping hooks\n");
+               CtdlLogPrintf(CTDL_DEBUG, "Skipping hooks\n");
                return(0);
        }
 
@@ -978,7 +953,7 @@ int PerformRoomHooks(struct ctdlroom *target_room)
        struct RoomFunctionHook *fcn;
        int total_retval = 0;
 
-       lprintf(CTDL_DEBUG, "Performing room hooks for <%s>\n", target_room->QRname);
+       CtdlLogPrintf(CTDL_DEBUG, "Performing room hooks for <%s>\n", target_room->QRname);
 
        for (fcn = RoomHookTable; fcn != NULL; fcn = fcn->next) {
                total_retval = total_retval + (*fcn->fcn_ptr) (target_room);
@@ -1020,7 +995,7 @@ void PerformDeleteHooks(char *room, long msgnum)
 
 
 
-int PerformXmsgHooks(char *sender, char *recp, char *msg)
+int PerformXmsgHooks(char *sender, char *sender_email, char *recp, char *msg)
 {
        struct XmsgFunctionHook *fcn;
        int total_sent = 0;
@@ -1031,7 +1006,7 @@ int PerformXmsgHooks(char *sender, char *recp, char *msg)
                        if (fcn->order == p) {
                                total_sent +=
                                        (*fcn->h_function_pointer)
-                                               (sender, recp, msg);
+                                               (sender, sender_email, recp, msg);
                        }
                }
                /* Break out of the loop if a higher-priority function
@@ -1044,19 +1019,6 @@ int PerformXmsgHooks(char *sender, char *recp, char *msg)
        return total_sent;
 }
 
-void CtdlRegisterMaintenanceThread(char *name, void *(*thread_proc)(void *arg))
-{
-       struct MaintenanceThreadHook *newfcn;
-
-       newfcn = (struct MaintenanceThreadHook *)
-           malloc(sizeof(struct MaintenanceThreadHook));
-       newfcn->name = name;
-       newfcn->next = MaintenanceThreadHookTable;
-       newfcn->fcn_ptr = thread_proc;
-       MaintenanceThreadHookTable = newfcn;
-
-       lprintf(CTDL_INFO, "Registered a new maintenance thread function\n");
-}
 
 
 
@@ -1069,7 +1031,7 @@ int CtdlRegisterDirectoryServiceFunc(int (*func)(char *cn, char *ou, void **obje
        {
                if (newfcn->cmd == cmd && !strcmp(newfcn->module, module))
                {
-                       lprintf(CTDL_ERR, "Directory service function already handled by module %s\n", module);
+                       CtdlLogPrintf(CTDL_ERR, "Directory service function already handled by module %s\n", module);
                        return -1;
                }
                newfcn = newfcn->next;
@@ -1082,7 +1044,7 @@ int CtdlRegisterDirectoryServiceFunc(int (*func)(char *cn, char *ou, void **obje
        newfcn->next = DirectoryServiceHookList;
        DirectoryServiceHookList = newfcn;
        
-       lprintf(CTDL_INFO, "Registered a new directory service function from module %s\n", module);
+       CtdlLogPrintf(CTDL_INFO, "Registered a new directory service function from module %s\n", module);
        return 0;
 }
 
@@ -1171,6 +1133,21 @@ int CtdlDoDirectoryServiceFunc(char *cn, char *ou, void **object, char *module,
        return 0;
 }
 
+void CtdlDestroyDirectoryServiceFuncs(void)
+{
+       struct DirectoryServiceHook *cur, *next;
+       
+       cur = DirectoryServiceHookList;
+       DirectoryServiceHookList = NULL;
+       while (cur)
+       {
+               next = cur->next;
+               CtdlLogPrintf(CTDL_INFO, "Destroyed directory service function for module %s.\n", cur->module);
+               free(cur);
+               cur = next;
+       }
+}
+
 /*
  * Dirty hack until we impliment a hook mechanism for this
  */