X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Finternet_addressing.h;h=cb19085c5bf0aeec36e57aa5aa4131191eefa997;hb=fcec795dc7d0d125028ca1bd3a5f35b3f97b265f;hp=74e581883803cdb0e2b37ee3f71baed0cc1bcb07;hpb=154ecc9117291889ed20b392e65725f883a2d962;p=citadel.git

diff --git a/citadel/internet_addressing.h b/citadel/internet_addressing.h
index 74e581883..cb19085c5 100644
--- a/citadel/internet_addressing.h
+++ b/citadel/internet_addressing.h
@@ -1,58 +1,23 @@
 
 #include "server.h"
+#include "ctdl_module.h"
 
-struct internet_address_list {
-	struct internet_address_list *next;
-	char ial_user[SIZ];
-	char ial_node[SIZ];
-	char ial_name[SIZ];
-};
-
-/* Data structure returned by validate_recipients() */
-struct recptypes {
-	int recptypes_magic;
-        int num_local;
-        int num_internet;
-        int num_ignet;
-	int num_room;
-        int num_error;
-	char *errormsg;
-	char *recp_local;
-	char *recp_internet;
-	char *recp_ignet;
-	char *recp_room;
-	char *recp_orgroom;
-	char *display_recp;
-	char *bounce_to;
-	char *envelope_from;
-	char *sending_room;
-};
-
-#define RECPTYPES_MAGIC 0xfeeb
-
-struct recptypes *validate_recipients(const char *recipients,
- 				      const char *RemoteIdentifier, 
-				      int Flags);
-
-void free_recipients(struct recptypes *);
-
-
-int fuzzy_match(struct ctdluser *us, char *matchstring);
+recptypes *validate_recipients(const char *recipients, const char *RemoteIdentifier, int Flags);
+void free_recipients(recptypes *);
 void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name);
 char *rfc822_fetch_field(const char *rfc822, const char *fieldname);
 void sanitize_truncated_recipient(char *str);
 char *qp_encode_email_addrs(char *source);
 int alias (char *name);
-
-
 int IsDirectory(char *addr, int allow_masq_domains);
-void CtdlDirectoryInit(void);
+void CtdlRebuildDirectoryIndex(void);
 int CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr);
 int CtdlDirectoryDelUser(char *internet_addr, char *citadel_addr);
 int CtdlDirectoryLookup(char *target, char *internet_addr, size_t targbuflen);
+void CtdlSetEmailAddressesForUser(char *requested_user, char *new_emailaddrs);
 struct CtdlMessage *convert_internet_message(char *rfc822);
 struct CtdlMessage *convert_internet_message_buf(StrBuf **rfc822);
-
+int CtdlIsMe(char *addr, int addr_buf_len);
 int CtdlHostAlias(char *fqdn);
 char *harvest_collected_addresses(struct CtdlMessage *msg);
 
@@ -62,18 +27,7 @@ char *harvest_collected_addresses(struct CtdlMessage *msg);
 enum {
 	hostalias_nomatch,
 	hostalias_localhost,
-	hostalias_gatewaydomain,
-	hostalias_directory,
 	hostalias_masq
 };
 
 extern char *inetcfg;
-
-
-struct spamstrings_t {
-	struct spamstrings_t *next;
-	char *string;
-};
-
-extern struct spamstrings_t *spamstrings;
-