At login time, copy prefer email addresses for user to the cs_inet_email fields in...

[citadel.git] / citadel / context.h

diff --git a/citadel/context.h b/citadel/context.h
index 1d152a413882b2aa966e6fa53c6664ce6f8119af..744fcb6001f5bb19ead336859d95f479a228808d 100644 (file)
--- a/citadel/context.h
+++ b/citadel/context.h
@@ -28,10 +28,12 @@ typedef enum __CCState {
        CON_SYS                 /* This is a system context and mustn't be purged */
 } CCState;
 
-#ifndef __ASYNCIO__
-#define __ASYNCIO__
-typedef struct AsyncIO AsyncIO; /* forward declaration for event_client.h */
-#endif
+//#ifndef __ASYNCIO__
+//#define __ASYNCIO__
+//typedef struct AsyncIO AsyncIO; /* forward declaration for event_client.h */
+//#endif
+
+
 #ifndef __CIT_CONTEXT__
 #define __CIT_CONTEXT__
 typedef struct CitContext CitContext;
@@ -41,7 +43,7 @@ typedef struct CitContext CitContext;
  * Here's the big one... the Citadel context structure.
  *
  * This structure keeps track of all information relating to a running 
- * session on the server.  We keep one of these for each session thread.
+ * session on the server.  We keep one of these for each session.
  *
  */
 struct CitContext {
@@ -50,7 +52,7 @@ struct CitContext {
 
        int cs_pid;             /* session ID */
        int dont_term;          /* for special activities like artv so we don't get killed */
-       double created;      /* time of birth */
+       double created;         /* time of birth */
        time_t lastcmd;         /* time of last command executed */
        time_t lastidle;        /* For computing idle time */
        CCState state;          /* thread state (see CON_ values below) */
@@ -134,7 +136,7 @@ struct CitContext {
        int msg4_dont_decode;
 
        /* Dynamically allocated session data */
-       char *session_specific_data;            /* Used by individual protocol modules */
+       void *session_specific_data;            /* Used by individual protocol modules */
        struct cit_ical *CIT_ICAL;              /* calendaring data */
        struct ma_info *ma;                     /* multipart/alternative data */
        const char *ServiceName;                /* readable purpose of this session */
@@ -149,14 +151,13 @@ struct CitContext {
        long *cached_msglist;                   /* results of the previous CtdlForEachMessage() */
        int cached_num_msgs;
 
-       AsyncIO *IO;                            /* if this session has AsyncIO going on... */
-};
-
+       char vcard_updated_by_ldap;             /* !0 iff ldap changed the vcard, treat as aide update */
 
+       //AsyncIO *IO;                          /* if this session has AsyncIO going on... */
+};
 
 #define CC MyContext()
 
-
 extern pthread_key_t MyConKey;                 /* TSD key for MyContext() */
 extern int num_sessions;
 extern CitContext masterCC;
@@ -205,18 +206,5 @@ static INLINE void become_session(CitContext *which_con) {
 
 
 
-/* typedef void (*CtdlDbgFunction) (const int); */
-
-extern int DebugSession;
-#define CONDBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (DebugSession != 0))
-
-#define CON_syslog(LEVEL, FORMAT, ...)                         \
-       CONDBGLOG(LEVEL) syslog(LEVEL,                          \
-                               "Context: " FORMAT, __VA_ARGS__)
-
-#define CONM_syslog(LEVEL, FORMAT)                     \
-       CONDBGLOG(LEVEL) syslog(LEVEL,                  \
-                               "Context: " FORMAT);
-
 
 #endif /* CONTEXT_H */