Did away with lprintf all together now its called CtdlLogPrintf()
[citadel.git] / citadel / serv_extensions.c
index 1aa74e5ebf0de3804f19645d0d03508fc33bf12a..7644b624345aa3fba8ccf9da1f6b6be972a5a250 100644 (file)
 #include <string.h>
 #include <limits.h>
 #include <ctype.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
 #include "serv_extensions.h"
 #include "sysdep_decls.h"
 #include "msgbase.h"
-#include "tools.h"
 #include "config.h"
 
+#include "modules/crypto/serv_crypto.h"        /* Needed until a universal crypto startup hook is implimented for CtdlStartTLS */
+
+#include "ctdl_module.h"
+
 #ifndef HAVE_SNPRINTF
 #include <stdarg.h>
 #include "snprintf.h"
@@ -37,6 +41,8 @@ struct NetprocFunctionHook *NetprocHookTable = NULL;
 struct DeleteFunctionHook *DeleteHookTable = NULL;
 struct ServiceFunctionHook *ServiceHookTable = NULL;
 struct FixedOutputHook *FixedOutputTable = NULL;
+struct RoomFunctionHook *RoomHookTable = NULL;
+struct SearchFunctionHook *SearchFunctionHookTable = NULL;
 
 struct ProtoFunctionHook {
        void (*handler) (char *cmdbuf);
@@ -45,6 +51,158 @@ struct ProtoFunctionHook {
        struct ProtoFunctionHook *next;
 } *ProtoHookList = NULL;
 
+
+struct DirectoryServiceHook {
+       int (*handler) (char *cn, char *ou, void **object);
+       int cmd;
+       char *module;
+       struct DirectoryServiceHook *next;
+} *DirectoryServiceHookList = NULL;
+
+struct DirectoryObject {
+       char *module;
+       void *object;
+       struct DirectoryObject *next;
+};
+
+#define ERR_PORT (1 << 1)
+
+
+static char *portlist = NULL;
+static size_t nSizPort = 0;
+
+static char *errormessages = NULL;
+size_t nSizErrmsg = 0;
+
+
+long   DetailErrorFlags;
+
+char *ErrSubject = "Startup Problems";
+char *ErrGeneral = "Citadel had trouble on starting up. %s This means, citadel won't be the service provider for a specific service you configured it to.\n\n"
+"If you don't want citadel to provide these services, turn them off in WebCit via %s%s\n\n%s\n\n"
+"To make both ways actualy take place restart the citserver with \"sendcommand down\"\n\n"
+"The errors returned by the system were:\n%s\n"
+"You can recheck the above if you follow this faq item:\n"
+"http://www.citadel.org/doku.php/faq:mastering_your_os:net#netstat";
+
+
+char *ErrPortShort = "We couldn't bind all ports you configured to be provided by citadel server.";
+char *ErrPortWhere = "Admin->System Preferences->Network.\n\nThe failed ports and sockets are: ";
+char *ErrPortHint = "If you want citadel to provide you with that functionality, "
+"check the output of \"netstat -lnp\" on linux Servers or \"netstat -na\" on *BSD"
+" and stop the programm, that binds these ports. You should eventually remove "
+" their initscripts in /etc/init.d so that you won't get this trouble once more.\n"
+" After that goto Administration -> Shutdown Citadel to make Citadel retry to bind this port.\n";
+
+
+void LogPrintMessages(long err)
+{
+       char *List, *DetailList, *Short, *Where, *Hint, *Message; 
+       int n = nSizPort + nSizErrmsg + 5;
+
+       Message = (char*) malloc(n * SIZ);
+
+       switch (err)
+       {
+       case ERR_PORT:
+               Short = ErrPortShort;
+               Where = ErrPortWhere;
+               Hint  = ErrPortHint;
+               List  = portlist;
+               DetailList = errormessages;
+               break;
+       default:
+               Short = "";
+               Where = "";
+               Hint  = "";
+               List  = "";
+               DetailList = "";
+       }
+
+
+       snprintf(Message, n * SIZ, ErrGeneral, Short, Where, List, Hint, DetailList);
+
+       CtdlLogPrintf(0,Message);
+       CtdlLogPrintf(0,ErrSubject);
+       quickie_message("Citadel", NULL, NULL, AIDEROOM, Message, FMT_FIXED, ErrSubject);
+       if (errormessages!=NULL) free (errormessages);
+       errormessages = NULL;
+       if (portlist!=NULL) free (portlist);
+       portlist = NULL;
+       free(Message);
+}
+
+
+
+void AppendString(char **target, char *append, size_t *len, size_t rate)
+{
+       size_t oLen = 0;
+       long AddLen;
+       long RelPtr = 0;
+
+       AddLen = strlen(append);
+
+       if (*len == 0)
+       {
+               *len = rate;
+
+               *target = (char*)malloc (*len * SIZ);
+       }
+       else 
+       {
+               oLen = strlen(*target);
+               RelPtr = strlen(*target);
+               if (oLen + AddLen + 2 > *len * SIZ)
+               {
+                       char *Buff = *target;
+                       size_t NewSiz = *len + 10;
+                       *target = malloc (NewSiz * SIZ);
+                       memcpy (*target, Buff, NewSiz * SIZ);
+                       *len = NewSiz;
+               }
+       }
+       memcpy (*target + oLen, append, AddLen);
+       (*target)[oLen + AddLen + 1] = '\n';
+       (*target)[oLen + AddLen + 2] = '\0';
+}
+
+void AddPortError(char *Port, char *ErrorMessage)
+{
+       char *pos;
+       long len;
+
+       DetailErrorFlags |= ERR_PORT;
+
+       AppendString(&errormessages, ErrorMessage, &nSizErrmsg, 10);
+       AppendString(&portlist, Port, &nSizPort, 2);
+
+       pos = strchr (portlist, ':');
+       if (pos != NULL) *pos = ';';
+       
+       len = strlen (errormessages);
+       if (nSizErrmsg * SIZ > len + 3)
+       {
+               errormessages[len] = ';';
+               errormessages[len+1] = ' ';
+               errormessages[len+2] = '\0';
+       }       
+}
+
+
+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;
+}
+
+
 void CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc)
 {
        struct ProtoFunctionHook *p;
@@ -61,75 +219,57 @@ void CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc)
        p->desc = desc;
        p->next = ProtoHookList;
        ProtoHookList = p;
-       lprintf(CTDL_INFO, "Registered server command %s (%s)\n", cmd, desc);
+       CtdlLogPrintf(CTDL_INFO, "Registered server command %s (%s)\n", cmd, desc);
 }
 
 
 void CtdlUnregisterProtoHook(void (*handler) (char *), char *cmd)
 {
-       struct ProtoFunctionHook *cur, *p;
+       struct ProtoFunctionHook *cur = NULL;
+       struct ProtoFunctionHook *p = NULL;
+       struct ProtoFunctionHook *lastcur = NULL;
 
-       for (cur = ProtoHookList; cur != NULL; cur = cur->next) {
+       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",
+                       CtdlLogPrintf(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;
        }
 }
 
-
-int DLoader_Exec_Cmd(char *cmdbuf)
+void CtdlDestroyProtoHooks(void)
 {
-       struct ProtoFunctionHook *p;
+       struct ProtoFunctionHook *cur, *p;
 
-       for (p = ProtoHookList; p; p = p->next) {
-               if (!strncasecmp(cmdbuf, p->cmd, 4)) {
-                       p->handler(&cmdbuf[5]);
-                       return 1;
-               }
+       cur = ProtoHookList; 
+       while (cur != NULL)
+       {
+               CtdlLogPrintf(CTDL_INFO, "Destroyed server command %s (%s)\n",
+                       cur->cmd, cur->desc);
+               p = cur->next;
+               free(cur);
+               cur = p;
        }
-       return 0;
-}
-
-void initialize_server_extensions(void)
-{
-       lprintf(CTDL_INFO, "%s\n", serv_bio_init());
-       lprintf(CTDL_INFO, "%s\n", serv_calendar_init());
-       lprintf(CTDL_INFO, "%s\n", serv_notes_init());
-       lprintf(CTDL_INFO, "%s\n", serv_ldap_init());
-       lprintf(CTDL_INFO, "%s\n", serv_chat_init());
-       lprintf(CTDL_INFO, "%s\n", serv_expire_init());
-       lprintf(CTDL_INFO, "%s\n", serv_imap_init());
-       lprintf(CTDL_INFO, "%s\n", serv_upgrade_init());
-       lprintf(CTDL_INFO, "%s\n", serv_inetcfg_init());
-       lprintf(CTDL_INFO, "%s\n", serv_listsub_init());
-       lprintf(CTDL_INFO, "%s\n", serv_mrtg_init());
-       lprintf(CTDL_INFO, "%s\n", serv_netfilter_init());
-       lprintf(CTDL_INFO, "%s\n", serv_network_init());
-       lprintf(CTDL_INFO, "%s\n", serv_newuser_init());
-       lprintf(CTDL_INFO, "%s\n", serv_pas2_init());
-       lprintf(CTDL_INFO, "%s\n", serv_pop3_init());
-       lprintf(CTDL_INFO, "%s\n", serv_rwho_init());
-       lprintf(CTDL_INFO, "%s\n", serv_smtp_init());
-       lprintf(CTDL_INFO, "%s\n", serv_spam_init());
-       /* lprintf(CTDL_INFO, "%s\n", serv_test_init()); */
-       lprintf(CTDL_INFO, "%s\n", serv_vandelay_init());
-       lprintf(CTDL_INFO, "%s\n", serv_vcard_init());
-       lprintf(CTDL_INFO, "%s\n", serv_fulltext_init());
-       lprintf(CTDL_INFO, "%s\n", serv_autocompletion_init());
+       ProtoHookList = NULL;
 }
 
 
-
 void CtdlRegisterCleanupHook(void (*fcn_ptr) (void))
 {
 
@@ -141,7 +281,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");
 }
 
 
@@ -153,7 +293,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;
@@ -164,6 +304,21 @@ void CtdlUnregisterCleanupHook(void (*fcn_ptr) (void))
        }
 }
 
+void CtdlDestroyCleanupHooks(void)
+{
+       struct CleanupFunctionHook *cur, *p;
+
+       cur = CleanupHookTable;
+       while (cur != NULL)
+       {
+               CtdlLogPrintf(CTDL_INFO, "Destroyed cleanup function\n");
+               p = cur->next;
+               free(cur);
+               cur = p;
+       }
+       CleanupHookTable = NULL;
+}
+
 
 void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType)
 {
@@ -177,7 +332,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);
 }
 
@@ -191,7 +346,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) {
@@ -203,6 +358,21 @@ void CtdlUnregisterSessionHook(void (*fcn_ptr) (void), int EventType)
        }
 }
 
+void CtdlDestroySessionHooks(void)
+{
+       struct SessionFunctionHook *cur, *p;
+
+       cur = SessionHookTable;
+       while (cur != NULL)
+       {
+               CtdlLogPrintf(CTDL_INFO, "Destroyed session function\n");
+               p = cur->next;
+               free(cur);
+               cur = p;
+       }
+       SessionHookTable = NULL;
+}
+
 
 void CtdlRegisterUserHook(void (*fcn_ptr) (struct ctdluser *), int EventType)
 {
@@ -216,7 +386,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);
 }
 
@@ -230,7 +400,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) {
@@ -242,6 +412,21 @@ void CtdlUnregisterUserHook(void (*fcn_ptr) (struct ctdluser *), int EventType)
        }
 }
 
+void CtdlDestroyUserHooks(void)
+{
+       struct UserFunctionHook *cur, *p;
+
+       cur = UserHookTable;
+       while (cur != NULL)
+       {
+               CtdlLogPrintf(CTDL_INFO, "Destroyed user function \n");
+               p = cur->next;
+               free(cur);
+               cur = p;
+       }
+       UserHookTable = NULL;
+}
+
 
 void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *),
                                int EventType)
@@ -256,7 +441,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);
 }
 
@@ -271,7 +456,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) {
@@ -283,6 +468,68 @@ void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *),
        }
 }
 
+void CtdlDestroyMessageHook(void)
+{
+       struct MessageFunctionHook *cur, *p;
+
+       cur = MessageHookTable; 
+       while (cur != NULL)
+       {
+               CtdlLogPrintf(CTDL_INFO, "Destroyed message function \n");
+               p = cur->next;
+               free(cur);
+               cur = p;
+       }
+       MessageHookTable = NULL;
+}
+
+
+void CtdlRegisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
+{
+       struct RoomFunctionHook *newfcn;
+
+       newfcn = (struct RoomFunctionHook *)
+           malloc(sizeof(struct RoomFunctionHook));
+       newfcn->next = RoomHookTable;
+       newfcn->fcn_ptr = fcn_ptr;
+       RoomHookTable = newfcn;
+
+       CtdlLogPrintf(CTDL_INFO, "Registered a new room function\n");
+}
+
+
+void CtdlUnregisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
+{
+       struct RoomFunctionHook *cur, *p;
+
+       for (cur = RoomHookTable; cur != NULL; cur = cur->next) {
+               while (cur != NULL && fcn_ptr == cur->fcn_ptr) {
+                       CtdlLogPrintf(CTDL_INFO, "Unregistered room function\n");
+                       p = cur->next;
+                       if (cur == RoomHookTable) {
+                               RoomHookTable = p;
+                       }
+                       free(cur);
+                       cur = p;
+               }
+       }
+}
+
+
+void CtdlDestroyRoomHooks(void)
+{
+       struct RoomFunctionHook *cur, *p;
+
+       cur = RoomHookTable;
+       while (cur != NULL)
+       {
+               CtdlLogPrintf(CTDL_INFO, "Unregistered room function\n");
+               p = cur->next;
+               free(cur);
+               cur = p;
+       }
+       RoomHookTable = NULL;
+}
 
 void CtdlRegisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
 {
@@ -294,7 +541,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");
 }
 
 
@@ -306,7 +553,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;
@@ -317,6 +564,21 @@ void CtdlUnregisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
        }
 }
 
+void CtdlDestroyNetprocHooks(void)
+{
+       struct NetprocFunctionHook *cur, *p;
+
+       cur = NetprocHookTable;
+       while (cur != NULL)
+       {
+               CtdlLogPrintf(CTDL_INFO, "Unregistered netproc function\n");
+               p = cur->next;
+               free(cur);
+               cur = p;
+       }
+       NetprocHookTable = NULL;
+}
+
 
 void CtdlRegisterDeleteHook(void (*handler)(char *, long) )
 {
@@ -328,7 +590,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 netproc function\n");
 }
 
 
@@ -340,7 +602,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 netproc function\n");
                        p = cur->next;
                        if (cur == DeleteHookTable) {
                                DeleteHookTable = p;
@@ -350,6 +612,20 @@ void CtdlUnregisterDeleteHook(void (*handler)(char *, long) )
                }
        }
 }
+void CtdlDestroyDeleteHooks(void)
+{
+       struct DeleteFunctionHook *cur, *p;
+
+       cur = DeleteHookTable;
+       while (cur != NULL)
+       {
+               CtdlLogPrintf(CTDL_INFO, "Destroyed netproc function\n");
+               p = cur->next;
+               free(cur);
+               cur = p;                
+       }
+       DeleteHookTable = NULL;
+}
 
 
 
@@ -365,7 +641,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);
 }
 
 
@@ -376,7 +652,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;
@@ -387,6 +663,22 @@ void CtdlUnregisterFixedOutputHook(char *content_type)
        }
 }
 
+void CtdlDestroyFixedOutputHooks(void)
+{
+       struct FixedOutputHook *cur, *p;
+
+       cur = FixedOutputTable; 
+       while (cur != NULL)
+       {
+               CtdlLogPrintf(CTDL_INFO, "Destroyed fixed output function for %s\n", cur->content_type);
+               p = cur->next;
+               free(cur);
+               cur = p;
+               
+       }
+       FixedOutputTable = NULL;
+}
+
 /* returns nonzero if we found a hook and used it */
 int PerformFixedOutputHooks(char *content_type, char *content, int content_length)
 {
@@ -405,22 +697,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;
 
@@ -429,7 +720,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) {
@@ -441,52 +732,80 @@ void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *), int order)
        }
 }
 
+void CtdlDestroyXmsgHooks(void)
+{
+       struct XmsgFunctionHook *cur, *p;
+
+       cur = XmsgHookTable;
+       while (cur != NULL)
+       {
+               CtdlLogPrintf(CTDL_INFO, "Destroyed x-msg function "
+                       "(priority %d)\n", cur->order);
+               p = cur->next;
+                       
+               free(cur);
+               cur = p;
+       }
+       XmsgHookTable = NULL;
+}
+
 
 void CtdlRegisterServiceHook(int tcp_port,
-                       char *sockpath,
-                       void (*h_greeting_function) (void),
-                       void (*h_command_function) (void),
-                       void (*h_async_function) (void)
-                       )
+                            char *sockpath,
+                            void (*h_greeting_function) (void),
+                            void (*h_command_function) (void),
+                            void (*h_async_function) (void),
+                            const char *ServiceName)
 {
        struct ServiceFunctionHook *newfcn;
-       char message[SIZ];
+       char *message;
+       char *error;
 
+       error = NULL;
        newfcn = (struct ServiceFunctionHook *)
            malloc(sizeof(struct ServiceFunctionHook));
+       message = (char*) malloc (SIZ);
+       
        newfcn->next = ServiceHookTable;
        newfcn->tcp_port = tcp_port;
        newfcn->sockpath = sockpath;
        newfcn->h_greeting_function = h_greeting_function;
        newfcn->h_command_function = h_command_function;
        newfcn->h_async_function = h_async_function;
+       newfcn->ServiceName = ServiceName;
 
        if (sockpath != NULL) {
-               newfcn->msock = ig_uds_server(sockpath, config.c_maxsessions);
-               snprintf(message, sizeof message, "Unix domain socket '%s': ", sockpath);
+               newfcn->msock = ig_uds_server(sockpath, config.c_maxsessions, &error);
+               snprintf(message, SIZ, "Unix domain socket '%s': ", sockpath);
        }
        else if (tcp_port <= 0) {       /* port -1 to disable */
-               lprintf(CTDL_INFO, "Service has been manually disabled, skipping\n");
+               CtdlLogPrintf(CTDL_INFO, "Service %s has been manually disabled, skipping\n", ServiceName);
+               free (message);
                free(newfcn);
                return;
        }
        else {
                newfcn->msock = ig_tcp_server(config.c_ip_addr,
-                                       tcp_port,
-                                       config.c_maxsessions);
-               snprintf(message, sizeof message, "TCP port %d: ", tcp_port);
+                                             tcp_port,
+                                             config.c_maxsessions, 
+                                             &error);
+               snprintf(message, SIZ, "TCP port %s:%d: (%s) ", 
+                        config.c_ip_addr, tcp_port, ServiceName);
        }
 
        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);
        }
+       free(message);
 }
 
 
@@ -509,12 +828,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 unknown service\n");
                        }
                        p = cur->next;
                        if (cur == ServiceHookTable) {
@@ -526,10 +845,81 @@ void CtdlUnregisterServiceHook(int tcp_port, char *sockpath,
        }
 }
 
+void CtdlDestroyServiceHook(void)
+{
+       struct ServiceFunctionHook *cur, *p;
+
+       cur = ServiceHookTable;
+       while (cur != NULL)
+       {
+               close(cur->msock);
+               if (cur->sockpath) {
+                       CtdlLogPrintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
+                               cur->sockpath);
+               } else if (cur->tcp_port) {
+                       CtdlLogPrintf(CTDL_INFO, "Closed TCP port %d\n", cur->tcp_port);
+               } else {
+                       CtdlLogPrintf(CTDL_INFO, "Unregistered unknown service\n");
+               }
+               p = cur->next;
+               free(cur);
+               cur = p;
+       }
+       ServiceHookTable = NULL;
+}
+
+void CtdlRegisterSearchFuncHook(void (*fcn_ptr)(int *, long **, char *), char *name)
+{
+       struct SearchFunctionHook *newfcn;
+
+       if (!name || !fcn_ptr) {
+               return;
+       }
+       
+       newfcn = (struct SearchFunctionHook *)
+           malloc(sizeof(struct SearchFunctionHook));
+       newfcn->next = SearchFunctionHookTable;
+       newfcn->name = name;
+       newfcn->fcn_ptr = fcn_ptr;
+       SearchFunctionHookTable = newfcn;
+
+       CtdlLogPrintf(CTDL_INFO, "Registered a new search function (%s)\n", name);
+}
+
+void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, char *), char *name)
+{
+       struct SearchFunctionHook *cur, *p;
+       
+       for (cur = SearchFunctionHookTable; cur != NULL; cur = cur->next) {
+               while (fcn_ptr && (cur->fcn_ptr == fcn_ptr) && name && !strcmp(name, cur->name)) {
+                       CtdlLogPrintf(CTDL_INFO, "Unregistered search function(%s)\n", name);
+                       p = cur->next;
+                       if (cur == SearchFunctionHookTable) {
+                               SearchFunctionHookTable = p;
+                       }
+                       free (cur);
+                       cur = p;
+               }
+       }
+}
+
+void CtdlModuleDoSearch(int *num_msgs, long **search_msgs, char *search_string, char *func_name)
+{
+       struct SearchFunctionHook *fcn = NULL;
+
+       for (fcn = SearchFunctionHookTable; fcn != NULL; fcn = fcn->next) {
+               if (!func_name || !strcmp(func_name, fcn->name)) {
+                       (*fcn->fcn_ptr) (num_msgs, search_msgs, search_string);
+                       return;
+               }
+       }
+       *num_msgs = 0;
+}
+
 
 void PerformSessionHooks(int EventType)
 {
-       struct SessionFunctionHook *fcn;
+       struct SessionFunctionHook *fcn = NULL;
 
        for (fcn = SessionHookTable; fcn != NULL; fcn = fcn->next) {
                if (fcn->eventtype == EventType) {
@@ -540,7 +930,7 @@ void PerformSessionHooks(int EventType)
 
 void PerformUserHooks(struct ctdluser *usbuf, int EventType)
 {
-       struct UserFunctionHook *fcn;
+       struct UserFunctionHook *fcn = NULL;
 
        for (fcn = UserHookTable; fcn != NULL; fcn = fcn->next) {
                if (fcn->eventtype == EventType) {
@@ -551,16 +941,16 @@ void PerformUserHooks(struct ctdluser *usbuf, int EventType)
 
 int PerformMessageHooks(struct CtdlMessage *msg, int EventType)
 {
-       struct MessageFunctionHook *fcn;
+       struct MessageFunctionHook *fcn = NULL;
        int total_retval = 0;
 
        /* 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);
        }
 
@@ -581,6 +971,22 @@ int PerformMessageHooks(struct CtdlMessage *msg, int EventType)
 }
 
 
+int PerformRoomHooks(struct ctdlroom *target_room)
+{
+       struct RoomFunctionHook *fcn;
+       int total_retval = 0;
+
+       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);
+       }
+
+       /* Return the sum of the return codes from the hook functions.
+        */
+       return total_retval;
+}
+
 
 int PerformNetprocHooks(struct CtdlMessage *msg, char *target_room)
 {
@@ -612,7 +1018,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;
@@ -623,7 +1029,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
@@ -635,3 +1041,142 @@ int PerformXmsgHooks(char *sender, char *recp, char *msg)
        }
        return total_sent;
 }
+
+
+
+
+int CtdlRegisterDirectoryServiceFunc(int (*func)(char *cn, char *ou, void **object), int cmd, char *module)
+{
+       struct DirectoryServiceHook *newfcn;
+       
+       newfcn = DirectoryServiceHookList;
+       while (newfcn)
+       {
+               if (newfcn->cmd == cmd && !strcmp(newfcn->module, module))
+               {
+                       CtdlLogPrintf(CTDL_ERR, "Directory service function already handled by module %s\n", module);
+                       return -1;
+               }
+               newfcn = newfcn->next;
+       }
+       
+       newfcn = (struct DirectoryServiceHook *) malloc (sizeof(struct DirectoryServiceHook));
+       newfcn->handler = func;
+       newfcn->cmd = cmd;
+       newfcn->module = module;
+       newfcn->next = DirectoryServiceHookList;
+       DirectoryServiceHookList = newfcn;
+       
+       CtdlLogPrintf(CTDL_INFO, "Registered a new directory service function from module %s\n", module);
+       return 0;
+}
+
+int CtdlDoDirectoryServiceFunc(char *cn, char *ou, void **object, char *module, int cmd)
+{
+       struct DirectoryServiceHook *curfcn;
+       struct DirectoryObject *our_object_list = NULL;
+       struct DirectoryObject *newobject = NULL;
+       struct DirectoryObject *oldobject = NULL;
+       
+       
+       curfcn = DirectoryServiceHookList;
+       if (object)
+               our_object_list = (struct DirectoryObject *) *object;
+       
+       while (curfcn)
+       {
+               if (curfcn->cmd == cmd)
+               {
+                       if (!module)
+                       {
+                               if (cmd == DIRECTORY_CREATE_OBJECT)
+                               {
+                                       newobject = (struct DirectoryObject*) malloc (sizeof(struct DirectoryObject));
+                                       newobject->module = curfcn->module;
+                                       newobject->object = NULL;
+                                       newobject->next = our_object_list;
+                                       our_object_list = newobject;
+                               }
+                               if (our_object_list)
+                               {
+                                       for(newobject = our_object_list; newobject; newobject=newobject->next)
+                                       {
+                                               if (!strcmp(newobject->module, curfcn->module))
+                                                       (void) curfcn->handler(cn, ou, &newobject->object);
+                                       }
+                               }
+                               else
+                                       (void) curfcn->handler(cn, ou, NULL);
+
+                               continue;
+                       }
+                       else 
+                       {
+                               if(!strcmp(curfcn->module, module))
+                               {
+                                       if (cmd == DIRECTORY_CREATE_OBJECT)
+                                       {
+                                               newobject = (struct DirectoryObject*) malloc (sizeof(struct DirectoryObject));
+                                               newobject->module = module;
+                                               newobject->object = NULL;
+                                               newobject->next = our_object_list;
+                                               our_object_list = newobject;
+                                       }
+                                       if (our_object_list)
+                                       {
+                                               for(newobject = our_object_list; newobject; newobject=newobject->next)
+                                               {
+                                                       if (!strcmp(newobject->module, curfcn->module))
+                                                               (void) curfcn->handler(cn, ou, &newobject->object);
+                                               }
+                                       }
+                                       else
+                                               (void) (curfcn->handler(cn, ou, NULL));
+
+                                       break;
+                               }
+                       }
+               }
+               curfcn=curfcn->next;
+       }
+       if (our_object_list)
+       {
+               *object = our_object_list;
+               if (cmd == DIRECTORY_FREE_OBJECT)
+               {       // The objects pointed to by the list should have been freed by the module that created it
+                       for(newobject = our_object_list; newobject; )
+                       {
+                               oldobject=newobject;
+                               newobject=newobject->next;
+                               free(oldobject);
+                       }
+                       *object=NULL;
+               }
+       }
+       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
+ */
+void CtdlModuleStartCryptoMsgs(char *ok_response, char *nosup_response, char *error_response)
+{
+#ifdef HAVE_OPENSSL
+       CtdlStartTLS (ok_response, nosup_response, error_response);
+#endif
+}