X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserv_sieve.h;h=2a203cda70975be8ddad3b5ba59e8251698fcc6d;hb=b1493ab199a2cf39b919cb8d0536263ae1d280aa;hp=e8eba73f1c9e378cd0b91ca91fd9dea428e176a0;hpb=858ea2bf2302d2603ddeb822e5ea22970c360bb2;p=citadel.git

diff --git a/citadel/serv_sieve.h b/citadel/serv_sieve.h
index e8eba73f1..2a203cda7 100644
--- a/citadel/serv_sieve.h
+++ b/citadel/serv_sieve.h
@@ -1,9 +1,4 @@
-/*
- * $Id: $
- */
-
 
-#ifdef HAVE_LIBSIEVE
 
 #include <sieve2.h>
 #include <sieve2_error.h>
@@ -15,12 +10,19 @@ struct sdm_script {
 	char *script_content;
 };
 
+struct sdm_vacation {
+	struct sdm_vacation *next;
+	char fromaddr[256];
+	time_t timestamp;
+};
+
 struct sdm_userdata {
 	sieve2_context_t *sieve2_context;	/**< for libsieve's use */
 	long config_msgnum;			/**< confirms that a sieve config was located */
 	char config_roomname[ROOMNAMELEN];
 	long lastproc;				/**< last message processed */
 	struct sdm_script *first_script;
+	struct sdm_vacation *first_vacation;
 };
 
 struct ctdl_sieve {
@@ -34,23 +36,30 @@ struct ctdl_sieve {
 	char recp_node[256];
 	char recp_name[256];
 	char sender[256];		/* To whom shall we send reject bounces or vacation messages? */
+	char subject[1024];		/* Retain msg subject so we can use it in vacation messages */
+	char envelope_from[1024];
+	char envelope_to[1024];
 };
 
 
 /* If you change this string you will break all of your Sieve configs. */
 #define CTDLSIEVECONFIGSEPARATOR	"\n-=<CtdlSieveConfigSeparator>=-\n"
 
+/* Maximum time we keep vacation fromaddr records online.  This implies that a vacation
+ * rule cannot exceed this amount of time.   (Any more than 30 days is a ridiculously
+ * long vacation which the person probably doesn't deserve.)
+ */
+#define MAX_VACATION	30
+
 extern struct RoomProcList *sieve_list;
 
 void sieve_queue_room(struct ctdlroom *);
 void perform_sieve_processing(void);
 
 void msiv_load(struct sdm_userdata *u);
-void msiv_store(struct sdm_userdata *u);
+void msiv_store(struct sdm_userdata *u, int changes_made);
 int msiv_setactive(struct sdm_userdata *u, char *script_name);
 char *msiv_getscript(struct sdm_userdata *u, char *script_name);
 int msiv_deletescript(struct sdm_userdata *u, char *script_name);
 void msiv_putscript(struct sdm_userdata *u, char *script_name, char *script_content);
 extern char *msiv_extensions;
-
-#endif /* HAVE_LIBSIEVE */