]> code.citadel.org Git - citadel.git/blobdiff - citadel/serv_extensions.c
Big change to the ldap code to break its dependancy on serv_vcard.c and
[citadel.git] / citadel / serv_extensions.c
index 3cbc5b9069d01469a50ace56f7f30ae87b90f35e..9cc062c6c3dcfc1e1d54e8ae8a437cc51ed2f6c8 100644 (file)
@@ -25,6 +25,8 @@
 
 #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"
@@ -51,6 +53,19 @@ struct ProtoFunctionHook {
 } *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)
 
 
@@ -58,10 +73,10 @@ static char *portlist = NULL;
 static size_t nSizPort = 0;
 
 static char *errormessages = NULL;
-static size_t nSizErrmsg = 0;
+size_t nSizErrmsg = 0;
 
 
-static long   DetailErrorFlags;
+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"
@@ -107,6 +122,8 @@ void LogPrintMessages(long err)
 
        snprintf(Message, n * SIZ, ErrGeneral, Short, Where, List, Hint, DetailList);
 
+       lprintf(0,Message);
+       lprintf(0,ErrSubject);
        quickie_message("Citadel", NULL, NULL, AIDEROOM, Message, FMT_FIXED, ErrSubject);
        if (errormessages!=NULL) free (errormessages);
        errormessages = NULL;
@@ -252,47 +269,6 @@ int DLoader_Exec_Cmd(char *cmdbuf)
        return 0;
 }
 
-#if 0
-void initialize_server_extensions(void)
-{
-       long filter;
-
-       nSizErrmsg = 0;
-
-       /*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_smtp_init());
-       lprintf(CTDL_INFO, "%s\n", serv_pop3_init());
-       lprintf(CTDL_INFO, "%s\n", serv_rwho_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());
-       lprintf(CTDL_INFO, "%s\n", serv_postfix_tcpdict());
-       lprintf(CTDL_INFO, "%s\n", serv_sieve_init());
-       lprintf(CTDL_INFO, "%s\n", serv_managesieve_init());
-       lprintf(CTDL_INFO, "%s\n", serv_funambol_init());*/
-       for (filter = 1; filter != 0; filter = filter << 1)
-               if ((filter & DetailErrorFlags) != 0)
-                       LogPrintMessages(filter);
-}
-
-#endif
 
 void CtdlRegisterCleanupHook(void (*fcn_ptr) (void))
 {
@@ -776,11 +752,11 @@ void CtdlDestroyXmsgHooks(void)
 
 
 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;
@@ -797,13 +773,14 @@ void CtdlRegisterServiceHook(int tcp_port,
        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, &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");
+               lprintf(CTDL_INFO, "Service %s has been manually disabled, skipping\n", ServiceName);
                free (message);
                free(newfcn);
                return;
@@ -813,8 +790,8 @@ void CtdlRegisterServiceHook(int tcp_port,
                                              tcp_port,
                                              config.c_maxsessions, 
                                              &error);
-               snprintf(message, SIZ, "TCP port %s:%d: ", 
-                        config.c_ip_addr, tcp_port);
+               snprintf(message, SIZ, "TCP port %s:%d: (%s) ", 
+                        config.c_ip_addr, tcp_port, ServiceName);
        }
 
        if (newfcn->msock > 0) {
@@ -1081,6 +1058,118 @@ void CtdlRegisterMaintenanceThread(char *name, void *(*thread_proc)(void *arg))
 }
 
 
+
+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))
+               {
+                       lprintf(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;
+       
+       lprintf(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;
+}
+
 /*
  * Dirty hack until we impliment a hook mechanism for this
  */