Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / serv_extensions.h

diff --git a/citadel/serv_extensions.h b/citadel/serv_extensions.h
index f4f720144d090da94eb6d5d816dddf35cbe31cb8..136be62f1b85d454ec8e17cd01dedefb83b325ce 100644 (file)
--- a/citadel/serv_extensions.h
+++ b/citadel/serv_extensions.h
@@ -20,13 +20,13 @@ typedef void (*CtdlDbgFunction) (const int);
 extern int DebugModules;
 #define MDBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (DebugModules != 0))
 
-#define MOD_syslog(LEVEL, FORMAT, ...)                         \
-       MDBGLOG(LEVEL) syslog(LEVEL,                            \
-                             "Modules: " FORMAT, __VA_ARGS__)
+#define MOD_syslog(LEVEL, FORMAT, ...)                                 \
+       MDBGLOG(LEVEL) syslog(LEVEL,                                    \
+                             "%s Modules: " FORMAT, IOSTR, __VA_ARGS__)
 
-#define MODM_syslog(LEVEL, FORMAT)                     \
-       MDBGLOG(LEVEL) syslog(LEVEL,                    \
-                             "Modules: " FORMAT);
+#define MODM_syslog(LEVEL, FORMAT)                             \
+       MDBGLOG(LEVEL) syslog(LEVEL,                            \
+                             "%s Modules: " FORMAT, IOSTR);
 
 
 
@@ -56,6 +56,13 @@ struct CleanupFunctionHook {
 extern CleanupFunctionHook *CleanupHookTable;
 
 
+typedef struct __LogDebugEntry {
+       CtdlDbgFunction F;
+       const char *Name;
+       long Len;
+       const int *LogP;
+} LogDebugEntry;
+extern HashList *LogDebugEntryTable;
 void initialize_server_extensions(void);
 int DLoader_Exec_Cmd(char *cmdbuf);
 char *Dynamic_Module_Init(void);
@@ -63,6 +70,9 @@ char *Dynamic_Module_Init(void);
 void CtdlDestroySessionHooks(void);
 void PerformSessionHooks(int EventType);
 
+int CheckTDAPVeto (int DBType, StrBuf *ErrMsg);
+void CtdlDestroyTDAPVetoHooks(void);
+
 void CtdlDestroyUserHooks(void);
 void PerformUserHooks(struct ctdluser *usbuf, int EventType);
 
@@ -72,7 +82,7 @@ void CtdlDestroyXmsgHooks(void);
 
 
 void CtdlDestroyMessageHook(void);
-int PerformMessageHooks(struct CtdlMessage *, int EventType);
+int PerformMessageHooks(struct CtdlMessage *, recptypes *recps, int EventType);
 
 
 void CtdlDestroyNetprocHooks(void);