New data format for internet addresses, convert old vcard format to new for version 912

[citadel.git] / citadel / internet_addressing.h

diff --git a/citadel/internet_addressing.h b/citadel/internet_addressing.h
index 62508d3fa2934c8eefa0b00e05b8612ca65c1233..344a62929fe79281153c4bf3f019c9d0ca04040a 100644 (file)
--- a/citadel/internet_addressing.h
+++ b/citadel/internet_addressing.h
@@ -2,28 +2,20 @@
 #include "server.h"
 #include "ctdl_module.h"
 
-recptypes *validate_recipients(const char *recipients,
-                                     const char *RemoteIdentifier, 
-                                     int Flags);
-
+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);
 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);
@@ -40,12 +32,3 @@ enum {
 };
 
 extern char *inetcfg;
-
-
-struct spamstrings_t {
-       struct spamstrings_t *next;
-       char *string;
-};
-
-extern struct spamstrings_t *spamstrings;
-