* Merge LDAP code; bindings are not yet complete

[citadel.git] / citadel / server.h

diff --git a/citadel/server.h b/citadel/server.h
index 6d74261ed155e64a8451b51e96632516b3172da3..9fc9ca6ec2458f798b5d3e230ac74b46770aec02 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -32,6 +32,8 @@ struct CtdlMessage {
 
 
 
+#define CTDLEXIT_SHUTDOWN      0       /* Normal shutdown; do NOT auto-restart */
+
 /*
  * Exit codes 101 through 109 are used for conditions in which
  * we deliberately do NOT want the service to automatically
@@ -43,7 +45,7 @@ struct CtdlMessage {
 #define CTDLEXIT_OOD           104     /* Out Of Date config - rerun setup */
 #define CTDLEXIT_DB            105     /* Unable to initialize database */
 #define CTDLEXIT_LIBCITADEL    106     /* Incorrect version of libcitadel */
-
+#define CTDL_EXIT_UNSUP_AUTH   107     /* Unsupported auth mode configured */
 
 
 
@@ -123,10 +125,6 @@ struct CitContext {
        int redirect_ssl;
 #endif
 
-       int buffering;
-       char *output_buffer;    /* hold output for one big dump */
-       int buffer_len;
-
        /* A linked list of all instant messages sent to us. */
        struct ExpressMessage *FirstExpressMessage;
        int disable_exp;        /* Set to 1 to disable incoming pages */
@@ -147,6 +145,7 @@ struct CitContext {
        struct ma_info *ma;                     /* multipart/alternative data */
        const char *ServiceName;                /* readable purpose of this session */
        void *openid_data;                      /* Data stored by the OpenID module */
+       char *ldap_dn;                          /* DN of user when using AUTHMODE_LDAP */
 };
 
 typedef struct CitContext t_context;
@@ -233,7 +232,6 @@ enum {
        S_DIRECTORY,
        S_NETCONFIGS,
        S_PUBLIC_CLIENTS,
-       S_LDAP,
        S_FLOORCACHE,
        S_DEBUGMEMLEAKS,
        S_ATBF,
@@ -246,6 +244,8 @@ enum {
        S_THREAD_LIST,
        S_XMPP_QUEUE,
        S_SCHEDULE_LIST,
+       S_SINGLE_USER,
+       S_LDAP,
        MAX_SEMAPHORES
 };