X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=libcitadel%2Flib%2Flibcitadel.h;h=3b478b98709d2d8157b81bc34a5dac15f2fab017;hb=5a21ba7fa52434ea1d6d27d2116dc6d05e61da98;hp=9b58553b10a3650c8a8988a5f4187a597bd5d6e8;hpb=cb6af686985b3d3eba6fa160ca28da43134bbf05;p=citadel.git

diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index 9b58553b1..3b478b987 100644
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -257,8 +257,8 @@ typedef struct __fd_iobuffer {
 	int SplicePipe[2];
 	int PipeSize;
 	long TotalSendSize;
-	long TotalSentAlready;
-	long TotalReadAlready;
+	loff_t TotalSentAlready;
+	loff_t TotalReadAlready;
 	long ChunkSize;
 	long ChunkSendRemain;
 	StrBuf *ChunkBuffer; /* just used if we don't have sendfile */
@@ -512,14 +512,14 @@ int GetKey(HashList *Hash, char *HKey, long HKLen, void **Data);
 int GetHashKeys(HashList *Hash, char ***List);
 int dbg_PrintHash(HashList *Hash, PrintHashContent first, PrintHashContent Second);
 int PrintHash(HashList *Hash, TransitionFunc Trans, PrintHashDataFunc PrintEntry);
-HashPos *GetNewHashPos(HashList *Hash, int StepWidth);
+HashPos *GetNewHashPos(const HashList *Hash, int StepWidth);
 int GetHashPosFromKey(HashList *Hash, const char *HKey, long HKLen, HashPos *At);
 int DeleteEntryFromHash(HashList *Hash, HashPos *At);
 int GetHashPosCounter(HashList *Hash, HashPos *At);
 void DeleteHashPos(HashPos **DelMe);
 int NextHashPos(HashList *Hash, HashPos *At);
 int GetHashPos(HashList *Hash, HashPos *At, long *HKLen, const char **HashKey, void **Data);
-int GetNextHashPos(HashList *Hash, HashPos *At, long *HKLen, const char **HashKey, void **Data);
+int GetNextHashPos(const HashList *Hash, HashPos *At, long *HKLen, const char **HashKey, void **Data);
 int GetHashAt(HashList *Hash,long At, long *HKLen, const char **HashKey, void **Data);
 void SortByHashKey(HashList *Hash, int Order);
 void SortByHashKeyStr(HashList *Hash);
@@ -659,6 +659,10 @@ extern ConstStr RoomNetCfgStrs[maxRoomNetCfg];
 extern "C" {
 #endif
 
+#define CFG_SMTP_FROM_FILTERALL 0
+#define CFG_SMTP_FROM_NOFILTER 1
+#define CFG_SMTP_FROM_CORRECT 2
+#define CFG_SMTP_FROM_REJECT 3
 /*
  * MIME types used in Citadel for configuration stuff
  */
@@ -671,6 +675,8 @@ extern "C" {
 #define XMPPMORTUARY	"application/x-citadel-xmpp-mortuary"
 #define INTERNETCFG     "application/x-citadel-internet-config"
 
+#define FILE_MAILALIAS       "__MAIL_ALIAS__"
+
 #define LISTING_FOLLOWS		100
 #define CIT_OK			200
 #define MORE_DATA		300
@@ -718,7 +724,7 @@ extern "C" {
 #define QR_ANONOPT	1024		/* Anonymous-Option room            */
 #define QR_NETWORK	2048		/* Shared network room              */
 #define QR_PREFONLY	4096		/* Preferred status needed to enter */
-#define QR_READONLY	8192		/* Aide status required to post     */
+#define QR_READONLY	8192		/* Admin status required to post     */
 #define QR_MAILBOX	16384		/* Set if this is a private mailbox */
 
 #define QR2_SYSTEM	1		/* System room; hide by default     */
@@ -751,7 +757,7 @@ extern "C" {
 #define UA_HASNEWMSGS           8	/* Unread messages exist in this room */
 #define UA_ZAPPED               16	/* User has forgotten (zapped) this room */
 #define UA_POSTALLOWED		32	/* User may post top-level messages here */
-#define UA_ADMINALLOWED		64	/* Aide or Room Aide rights exist here */
+#define UA_ADMINALLOWED		64	/* Admin or Room Admin rights exist here */
 #define UA_DELETEALLOWED	128	/* User is allowed to delete messages from this room */
 #define UA_REPLYALLOWED		256	/* User is allowed to reply to existing messages here */
 /* runtime flag extracted from goto reply; not db persistant, should be moved if new flags added */