* Prepped portions of the code for imminent merge of LDAP auth module.

[citadel.git] / citadel / server.h

diff --git a/citadel/server.h b/citadel/server.h
index 1d4457dac82ab04e4c51a8a7044d6e598fe1deb3..13660559aa807fd8b61b36e43156dee794829d8b 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 */
 
 
 
@@ -62,6 +64,7 @@ struct CitContext {
        int kill_me;            /* Set to nonzero to flag for termination */
        int client_socket;
        int cs_pid;             /* session ID */
+       int dont_term;          /* for special activities like artv so we don't get killed */
        time_t lastcmd;         /* time of last command executed */
        time_t lastidle;        /* For computing idle time */
 
@@ -122,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 */
@@ -232,7 +231,6 @@ enum {
        S_DIRECTORY,
        S_NETCONFIGS,
        S_PUBLIC_CLIENTS,
-       S_LDAP,
        S_FLOORCACHE,
        S_DEBUGMEMLEAKS,
        S_ATBF,
@@ -245,6 +243,8 @@ enum {
        S_THREAD_LIST,
        S_XMPP_QUEUE,
        S_SCHEDULE_LIST,
+       S_SINGLE_USER,
+       S_LDAP,
        MAX_SEMAPHORES
 };