X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserv_vcard.c;h=ffa723f3f651d86a43559fc68385a32e1a498a92;hb=02d9dbca862ffa00b2041287596119a54867762c;hp=f1b16f7e9b4ea6babbaba922083fd4c5cb033842;hpb=2cf011818193869ad21a818b36b47d9b94fa701d;p=citadel.git

diff --git a/citadel/serv_vcard.c b/citadel/serv_vcard.c
index f1b16f7e9..ffa723f3f 100644
--- a/citadel/serv_vcard.c
+++ b/citadel/serv_vcard.c
@@ -7,13 +7,6 @@
  * Copyright (c) 1999-2002 / released under the GNU General Public License
  */
 
-/*
- * Where we keep messages containing the vCards that source our directory.  It
- * makes no sense to change this, because you'd have to change it on every
- * system on the network.  That would be stupid.
- */
-#define ADDRESS_BOOK_ROOM	"Global Address Book"
-
 /*
  * Format of the "Exclusive ID" field of the message containing a user's
  * vCard.  Doesn't matter what it really looks like as long as it's both
@@ -31,6 +24,7 @@
 #include <signal.h>
 #include <pwd.h>
 #include <errno.h>
+#include <ctype.h>
 #include <sys/types.h>
 
 #if TIME_WITH_SYS_TIME
@@ -64,14 +58,7 @@
 #include "tools.h"
 #include "vcard.h"
 #include "serv_ldap.h"
-
-struct vcard_internal_info {
-	long msgnum;
-};
-
-/* Message number symbol used internally by these functions */
-#define VC ((struct vcard_internal_info *)CtdlGetUserData(SYM_VCARD))
-
+#include "serv_vcard.h"
 
 /*
  * set global flag calling for an aide to validate new users
@@ -136,7 +123,6 @@ void vcard_extract_internet_addresses(struct CtdlMessage *msg,
 /*
  * Callback for vcard_add_to_directory()
  * (Lotsa ugly nested callbacks.  Oh well.)
- * This little shim function makes sure we're not 
  */
 void vcard_directory_add_user(char *internet_addr, char *citadel_addr) {
 	char buf[SIZ];
@@ -147,7 +133,7 @@ void vcard_directory_add_user(char *internet_addr, char *citadel_addr) {
 	 */
 	if (CC->logged_in) {
 		lprintf(CTDL_DEBUG, "Checking for <%s>...\n", internet_addr);
-		if (CtdlDirectoryLookup(buf, internet_addr) == 0) {
+		if (CtdlDirectoryLookup(buf, internet_addr, sizeof buf) == 0) {
 			if (strcasecmp(buf, citadel_addr)) {
 				/* This address belongs to someone else.
 				 * Bail out silently without saving.
@@ -186,27 +172,27 @@ void vcard_add_to_directory(long msgnum, void *data) {
  * Initialize Global Adress Book
  */
 void cmd_igab(char *argbuf) {
-        char hold_rm[ROOMNAMELEN];
+	char hold_rm[ROOMNAMELEN];
 
 	if (CtdlAccessCheck(ac_aide)) return;
 
-        strcpy(hold_rm, CC->room.QRname);	/* save current room */
+	strcpy(hold_rm, CC->room.QRname);	/* save current room */
 
-        if (getroom(&CC->room, ADDRESS_BOOK_ROOM) != 0) {
-                getroom(&CC->room, hold_rm);
+	if (getroom(&CC->room, ADDRESS_BOOK_ROOM) != 0) {
+		getroom(&CC->room, hold_rm);
 		cprintf("%d cannot get address book room\n", ERROR + ROOM_NOT_FOUND);
 		return;
-        }
+	}
 
 	/* Empty the existing database first.
 	 */
 	CtdlDirectoryInit();
 
-        /* We want *all* vCards in this room */
-        CtdlForEachMessage(MSGS_ALL, 0, "text/x-vcard",
+	/* We want *all* vCards in this room */
+	CtdlForEachMessage(MSGS_ALL, 0, NULL, "text/x-vcard",
 		NULL, vcard_add_to_directory, NULL);
 
-        getroom(&CC->room, hold_rm);	/* return to saved room */
+	getroom(&CC->room, hold_rm);	/* return to saved room */
 	cprintf("%d Directory has been rebuilt.\n", CIT_OK);
 }
 
@@ -215,9 +201,9 @@ void cmd_igab(char *argbuf) {
 
 /*
  * See if there is a valid Internet address in a vCard to use for outbound
- * Internet messages.  If there is, stick it in CC->cs_inet_email.
+ * Internet messages.  If there is, stick it in the buffer.
  */
-void vcard_populate_cs_inet_email(struct vCard *v) {
+void extract_primary_inet_email(char *emailaddrbuf, size_t emailaddrbuf_len, struct vCard *v) {
 	char *s, *addr;
 	int continue_searching = 1;
 	int instance = 0;
@@ -234,10 +220,8 @@ void vcard_populate_cs_inet_email(struct vCard *v) {
 			if (strlen(addr) > 0) {
 				if (IsDirectory(addr)) {
 					continue_searching = 0;
-					safestrncpy(CC->cs_inet_email,
-						addr,
-						sizeof(CC->cs_inet_email)
-					);
+					safestrncpy(emailaddrbuf, addr,
+						emailaddrbuf_len);
 				}
 			}
 			free(addr);
@@ -276,10 +260,18 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
 	   && (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) {
 		/* Yes, we want to do this */
 		yes_my_citadel_config = 1;
+
+#ifdef VCARD_SAVES_BY_AIDES_ONLY
+		/* Prevent non-aides from performing registration changes */
+		if (CC->user.axlevel < 6) {
+			return(1);
+		}
+#endif
+
 	}
 
 	/* Is this a room with an address book in it? */
-	if (CC->curr_view == VIEW_ADDRESSBOOK) {
+	if (CC->room.QRdefaultview == VIEW_ADDRESSBOOK) {
 		yes_any_vcard_room = 1;
 	}
 
@@ -330,8 +322,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
 				 * want to make sure there is absolutely only one
 				 * vCard in the user's config room at all times.
 				 */
-				CtdlDeleteMessages(CC->room.QRname,
-						0L, "text/x-vcard");
+				CtdlDeleteMessages(CC->room.QRname, NULL, 0, "text/x-vcard");
 
 				/* Make the author of the message the name of the user.
 				 */
@@ -369,24 +360,37 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
 
 				/* Enforce local UID policy if applicable */
 				if (yes_my_citadel_config) {
-                        		snprintf(buf, sizeof buf, VCARD_EXT_FORMAT,
-                                		msg->cm_fields['A'], NODENAME);
+					snprintf(buf, sizeof buf, VCARD_EXT_FORMAT,
+						msg->cm_fields['A'], NODENAME);
 					vcard_set_prop(v, "UID", buf, 0);
 				}
 
 				/* 
 				 * Set the EUID of the message to the UID of the vCard.
-				 * Also set the Subject if there isn't already one.
 				 */
 				if (msg->cm_fields['E'] != NULL) free(msg->cm_fields['E']);
 				s = vcard_get_prop(v, "UID", 0, 0, 0);
-                        	if (s != NULL) {
+				if (s != NULL) {
 					msg->cm_fields['E'] = strdup(s);
 					if (msg->cm_fields['U'] == NULL) {
 						msg->cm_fields['U'] = strdup(s);
 					}
 				}
 
+				/*
+				 * Set the Subject to the name in the vCard.
+				 */
+				s = vcard_get_prop(v, "FN", 0, 0, 0);
+				if (s == NULL) {
+					s = vcard_get_prop(v, "N", 0, 0, 0);
+				}
+				if (s != NULL) {
+					if (msg->cm_fields['U'] != NULL) {
+						free(msg->cm_fields['U']);
+					}
+					msg->cm_fields['U'] = strdup(s);
+				}
+
 				/* Re-serialize it back into the msg body */
 				ser = vcard_serialize(v);
 				if (ser != NULL) {
@@ -453,12 +457,12 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
 
 			/* Store our Internet return address in memory */
 			v = vcard_load(msg->cm_fields['M']);
-			vcard_populate_cs_inet_email(v);
+			extract_primary_inet_email(CC->cs_inet_email,
+						sizeof CC->cs_inet_email, v);
 			vcard_free(v);
 
 			/* Put it in the Global Address Book room... */
-			CtdlSaveMsgPointerInRoom(ADDRESS_BOOK_ROOM, I,
-				(SM_VERIFY_GOODNESS | SM_DO_REPL_CHECK) );
+			CtdlSaveMsgPointerInRoom(ADDRESS_BOOK_ROOM, I, 1, msg);
 
 			/* ...and also in the directory database. */
 			vcard_add_to_directory(I, NULL);
@@ -488,8 +492,11 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
 /*
  * back end function used for callbacks
  */
-void vcard_gu_backend(long msgnum, void *userdata) {
-	VC->msgnum = msgnum;
+void vcard_gu_backend(long supplied_msgnum, void *userdata) {
+	long *msgnum;
+
+	msgnum = (long *) userdata;
+	*msgnum = supplied_msgnum;
 }
 
 
@@ -498,28 +505,29 @@ void vcard_gu_backend(long msgnum, void *userdata) {
  * and return an empty vCard.
  */
 struct vCard *vcard_get_user(struct ctdluser *u) {
-        char hold_rm[ROOMNAMELEN];
-        char config_rm[ROOMNAMELEN];
+	char hold_rm[ROOMNAMELEN];
+	char config_rm[ROOMNAMELEN];
 	struct CtdlMessage *msg;
 	struct vCard *v;
+	long VCmsgnum;
 
-        strcpy(hold_rm, CC->room.QRname);	/* save current room */
-        MailboxName(config_rm, sizeof config_rm, u, USERCONFIGROOM);
+	strcpy(hold_rm, CC->room.QRname);	/* save current room */
+	MailboxName(config_rm, sizeof config_rm, u, USERCONFIGROOM);
 
-        if (getroom(&CC->room, config_rm) != 0) {
-                getroom(&CC->room, hold_rm);
-                return vcard_new();
-        }
+	if (getroom(&CC->room, config_rm) != 0) {
+		getroom(&CC->room, hold_rm);
+		return vcard_new();
+	}
 
-        /* We want the last (and probably only) vcard in this room */
-	VC->msgnum = (-1);
-        CtdlForEachMessage(MSGS_LAST, 1, "text/x-vcard",
-		NULL, vcard_gu_backend, NULL);
-        getroom(&CC->room, hold_rm);	/* return to saved room */
+	/* We want the last (and probably only) vcard in this room */
+	VCmsgnum = (-1);
+	CtdlForEachMessage(MSGS_LAST, 1, NULL, "text/x-vcard",
+		NULL, vcard_gu_backend, (void *)&VCmsgnum );
+	getroom(&CC->room, hold_rm);	/* return to saved room */
 
-	if (VC->msgnum < 0L) return vcard_new();
+	if (VCmsgnum < 0L) return vcard_new();
 
-	msg = CtdlFetchMessage(VC->msgnum, 1);
+	msg = CtdlFetchMessage(VCmsgnum, 1);
 	if (msg == NULL) return vcard_new();
 
 	v = vcard_load(msg->cm_fields['M']);
@@ -535,30 +543,30 @@ struct vCard *vcard_get_user(struct ctdluser *u) {
  * Write our config to disk
  */
 void vcard_write_user(struct ctdluser *u, struct vCard *v) {
-        char temp[PATH_MAX];
-        FILE *fp;
+	char temp[PATH_MAX];
+	FILE *fp;
 	char *ser;
 
-        strcpy(temp, tmpnam(NULL));
+	CtdlMakeTempFileName(temp, sizeof temp);
 	ser = vcard_serialize(v);
 
-        fp = fopen(temp, "w");
-        if (fp == NULL) return;
+	fp = fopen(temp, "w");
+	if (fp == NULL) return;
 	if (ser == NULL) {
 		fprintf(fp, "begin:vcard\r\nend:vcard\r\n");
 	} else {
 		fwrite(ser, strlen(ser), 1, fp);
 		free(ser);
 	}
-        fclose(fp);
+	fclose(fp);
 
-        /* This handy API function does all the work for us.
+	/* This handy API function does all the work for us.
 	 * NOTE: normally we would want to set that last argument to 1, to
 	 * force the system to delete the user's old vCard.  But it doesn't
 	 * have to, because the vcard_upload_beforesave() hook above
 	 * is going to notice what we're trying to do, and delete the old vCard.
 	 */
-        CtdlWriteObject(USERCONFIGROOM,	/* which room */
+	CtdlWriteObject(USERCONFIGROOM,	/* which room */
 			"text/x-vcard",	/* MIME type */
 			temp,		/* temp file */
 			u,		/* which user */
@@ -566,7 +574,7 @@ void vcard_write_user(struct ctdluser *u, struct vCard *v) {
 			0,		/* don't delete others of this type */
 			0);		/* no flags */
 
-        unlink(temp);
+	unlink(temp);
 }
 
 
@@ -604,7 +612,7 @@ void cmd_regi(char *argbuf) {
 
 	cprintf("%d Send registration...\n", SEND_LISTING);
 	a=0;
-	while (client_gets(buf), strcmp(buf,"000")) {
+	while (client_getln(buf, sizeof buf), strcmp(buf,"000")) {
 		if (a==0) vcard_set_prop(my_vcard, "n", buf, 0);
 		if (a==1) strcpy(tmpaddr, buf);
 		if (a==2) strcpy(tmpcity, buf);
@@ -640,11 +648,11 @@ void cmd_greg(char *argbuf)
 	struct ctdluser usbuf;
 	struct vCard *v;
 	char *s;
-	char who[SIZ];
-	char adr[SIZ];
-	char buf[SIZ];
+	char who[USERNAME_SIZE];
+	char adr[256];
+	char buf[256];
 
-	extract(who, argbuf, 0);
+	extract_token(who, argbuf, 0, '|', sizeof who);
 
 	if (!(CC->logged_in)) {
 		cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
@@ -675,13 +683,13 @@ void cmd_greg(char *argbuf)
 	s = vcard_get_prop(v, "adr", 0, 0, 0);
 	snprintf(adr, sizeof adr, "%s", s ? s : " ");/* address... */
 
-	extract_token(buf, adr, 2, ';');
+	extract_token(buf, adr, 2, ';', sizeof buf);
 	cprintf("%s\n", buf);				/* street */
-	extract_token(buf, adr, 3, ';');
+	extract_token(buf, adr, 3, ';', sizeof buf);
 	cprintf("%s\n", buf);				/* city */
-	extract_token(buf, adr, 4, ';');
+	extract_token(buf, adr, 4, ';', sizeof buf);
 	cprintf("%s\n", buf);				/* state */
-	extract_token(buf, adr, 5, ';');
+	extract_token(buf, adr, 5, ';', sizeof buf);
 	cprintf("%s\n", buf);				/* zip */
 
 	s = vcard_get_prop(v, "tel;home", 0, 0, 0);
@@ -700,74 +708,27 @@ void cmd_greg(char *argbuf)
 	s = vcard_get_prop(v, "adr", 0, 0, 0);
 	snprintf(adr, sizeof adr, "%s", s ? s : " ");/* address... */
 
-	extract_token(buf, adr, 6, ';');
+	extract_token(buf, adr, 6, ';', sizeof buf);
 	cprintf("%s\n", buf);				/* country */
 	cprintf("000\n");
 }
 
 
+
 /*
  * When a user is being created, create his/her vCard.
  */
 void vcard_newuser(struct ctdluser *usbuf) {
-	char buf[SIZ];
-	char vname[SIZ];
-
-	char lastname[SIZ];
-	char firstname[SIZ];
-	char middlename[SIZ];
-	char honorific_prefixes[SIZ];
-	char honorific_suffixes[SIZ];
-
-	struct vCard *v;
+	char vname[256];
+	char buf[256];
 	int i;
+	struct vCard *v;
 
-	/* Try to intelligently convert the screen name to a
-	 * fully expanded vCard name based on the number of
-	 * words in the name
-	 */
-	strcpy(lastname, "");
-	strcpy(firstname, "");
-	strcpy(middlename, "");
-	strcpy(honorific_prefixes, "");
-	strcpy(honorific_suffixes, "");
-
-	strcpy(buf, usbuf->fullname);
-
-	/* Honorific suffixes */
-	if (num_tokens(buf, ',') > 1) {
-		extract_token(honorific_suffixes, buf, (num_tokens(buf, ' ') - 1), ',');
-		remove_token(buf, (num_tokens(buf, ',') - 1), ',');
-	}
-
-	/* Find a last name */
-	extract_token(lastname, buf, (num_tokens(buf, ' ') - 1), ' ');
-	remove_token(buf, (num_tokens(buf, ' ') - 1), ' ');
-
-	/* Find honorific prefixes */
-	if (num_tokens(buf, ' ') > 2) {
-		extract_token(honorific_prefixes, buf, 0, ' ');
-		remove_token(buf, 0, ' ');
-	}
-
-	/* Find a middle name */
-	if (num_tokens(buf, ' ') > 1) {
-		extract_token(middlename, buf, (num_tokens(buf, ' ') - 1), ' ');
-		remove_token(buf, (num_tokens(buf, ' ') - 1), ' ');
-	}
-
-	/* Anything left is probably the first name */
-	strcpy(firstname, buf);
-	striplt(firstname);
-
-	/* Compose the structured name */
-	sprintf(vname, "%s;%s;%s;%s;%s", lastname, firstname, middlename,
-		honorific_prefixes, honorific_suffixes);
-
+	vcard_fn_to_n(vname, usbuf->fullname, sizeof vname);
 	lprintf(CTDL_DEBUG, "Converted <%s> to <%s>\n", usbuf->fullname, vname);
 
 	/* Create and save the vCard */
-        v = vcard_new();
+	v = vcard_new();
 	if (v == NULL) return;
 	sprintf(buf, "%s@%s", usbuf->fullname, config.c_fqdn);
 	for (i=0; i<strlen(buf); ++i) {
@@ -795,22 +756,22 @@ void vcard_purge(struct ctdluser *usbuf) {
 	if (msg == NULL) return;
 	memset(msg, 0, sizeof(struct CtdlMessage));
 
-        msg->cm_magic = CTDLMESSAGE_MAGIC;
-        msg->cm_anon_type = MES_NORMAL;
-        msg->cm_format_type = 0;
-        msg->cm_fields['A'] = strdup(usbuf->fullname);
-        msg->cm_fields['O'] = strdup(ADDRESS_BOOK_ROOM);
-        msg->cm_fields['N'] = strdup(NODENAME);
-        msg->cm_fields['M'] = strdup("Purge this vCard\n");
+	msg->cm_magic = CTDLMESSAGE_MAGIC;
+	msg->cm_anon_type = MES_NORMAL;
+	msg->cm_format_type = 0;
+	msg->cm_fields['A'] = strdup(usbuf->fullname);
+	msg->cm_fields['O'] = strdup(ADDRESS_BOOK_ROOM);
+	msg->cm_fields['N'] = strdup(NODENAME);
+	msg->cm_fields['M'] = strdup("Purge this vCard\n");
 
-        snprintf(buf, sizeof buf, VCARD_EXT_FORMAT,
+	snprintf(buf, sizeof buf, VCARD_EXT_FORMAT,
 			msg->cm_fields['A'], NODENAME);
-        msg->cm_fields['E'] = strdup(buf);
+	msg->cm_fields['E'] = strdup(buf);
 
 	msg->cm_fields['S'] = strdup("CANCEL");
 
-        CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM);
-        CtdlFreeMessage(msg);
+	CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM);
+	CtdlFreeMessage(msg);
 }
 
 
@@ -898,14 +859,14 @@ EOH:	CtdlFreeMessage(msg);
  * Query Directory
  */
 void cmd_qdir(char *argbuf) {
-	char citadel_addr[SIZ];
-	char internet_addr[SIZ];
+	char citadel_addr[256];
+	char internet_addr[256];
 
 	if (CtdlAccessCheck(ac_logged_in)) return;
 
-	extract(internet_addr, argbuf, 0);
+	extract_token(internet_addr, argbuf, 0, '|', sizeof internet_addr);
 
-	if (CtdlDirectoryLookup(citadel_addr, internet_addr) != 0) {
+	if (CtdlDirectoryLookup(citadel_addr, internet_addr, sizeof citadel_addr) != 0) {
 		cprintf("%d %s was not found.\n",
 			ERROR + NO_SUCH_USER, internet_addr);
 		return;
@@ -914,6 +875,56 @@ void cmd_qdir(char *argbuf) {
 	cprintf("%d %s\n", CIT_OK, citadel_addr);
 }
 
+/*
+ * Query Directory, in fact an alias to match postfix tcp auth.
+ */
+void check_get(void) {
+	char internet_addr[256];
+
+	char cmdbuf[SIZ];
+
+	time(&CC->lastcmd);
+	memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
+	if (client_getln(cmdbuf, sizeof cmdbuf) < 1) {
+		lprintf(CTDL_CRIT, "Client disconnected: ending session.\n");
+		CC->kill_me = 1;
+		return;
+	}
+	lprintf(CTDL_INFO, ": %s\n", cmdbuf);
+	while (strlen(cmdbuf) < 3) strcat(cmdbuf, " ");
+
+	if (strcasecmp(cmdbuf, "GET "));
+	{
+		struct recptypes *rcpt;
+		char *argbuf = &cmdbuf[4];
+		
+		extract_token(internet_addr, argbuf, 0, '|', sizeof internet_addr);
+		rcpt = validate_recipients(internet_addr);
+		if ((rcpt != NULL)&&
+			(
+			 (*rcpt->recp_local != '\0')||
+			 (*rcpt->recp_room != '\0')||
+			 (*rcpt->recp_ignet != '\0')))
+		{
+
+			cprintf("200 OK %s\n", internet_addr);
+			lprintf(CTDL_INFO, "sending 200 OK for the room %s\n", rcpt->display_recp);
+		}
+		else 
+		{
+			cprintf("500 REJECT noone here by that name.\n");
+			
+			lprintf(CTDL_INFO, "sending 500 REJECT noone here by that name: %s\n", internet_addr);
+		}
+		if (rcpt != NULL) free (rcpt);
+	}
+///	CC->kill_me = 1;
+}
+
+void check_get_greeting(void) {
+/* dummy function, we have no greeting in this verry simple protocol. */
+}
+
 
 /*
  * We don't know if the Contacts room exists so we just create it at login
@@ -947,25 +958,191 @@ void vcard_create_room(void)
 
 
 /*
- * Session startup, allocate some per-session data
+ * When a user logs in...
  */
-void vcard_session_startup_hook(void) {
-	CtdlAllocUserData(SYM_VCARD, sizeof(struct vcard_internal_info));
+void vcard_session_login_hook(void) {
+	struct vCard *v;
+
+	v = vcard_get_user(&CC->user);
+	extract_primary_inet_email(CC->cs_inet_email,
+				sizeof CC->cs_inet_email, v);
+	vcard_free(v);
+
+	vcard_create_room();
 }
 
 
+/* 
+ * Turn an arbitrary RFC822 address into a struct vCard for possible
+ * inclusion into an address book.
+ */
+struct vCard *vcard_new_from_rfc822_addr(char *addr) {
+	struct vCard *v;
+	char user[256], node[256], name[256], email[256], n[256], uid[256];
+	int i;
+
+	v = vcard_new();
+	if (v == NULL) return(NULL);
+
+	process_rfc822_addr(addr, user, node, name);
+	vcard_set_prop(v, "fn", name, 0);
+
+	vcard_fn_to_n(n, name, sizeof n);
+	vcard_set_prop(v, "n", n, 0);
+
+	snprintf(email, sizeof email, "%s@%s", user, node);
+	vcard_set_prop(v, "email;internet", email, 0);
+
+	snprintf(uid, sizeof uid, "collected: %s %s@%s", name, user, node);
+	for (i=0; i<strlen(uid); ++i) {
+		if (isspace(uid[i])) uid[i] = '_';
+		uid[i] = tolower(uid[i]);
+	}
+	vcard_set_prop(v, "UID", uid, 0);
+
+	return(v);
+}
+
+
+
 /*
- * When a user logs in...
+ * This is called by store_harvested_addresses() to remove from the
+ * list any addresses we already have in our address book.
  */
-void vcard_session_login_hook(void) {
+void strip_addresses_already_have(long msgnum, void *userdata) {
+	char *collected_addresses;
+	struct CtdlMessage *msg;
 	struct vCard *v;
+	char *value = NULL;
+	int i, j;
+	char addr[256], user[256], node[256], name[256];
 
-	v = vcard_get_user(&CC->user);
-	vcard_populate_cs_inet_email(v);
+	collected_addresses = (char *)userdata;
+
+	msg = CtdlFetchMessage(msgnum, 1);
+	if (msg == NULL) return;
+	v = vcard_load(msg->cm_fields['M']);
+	CtdlFreeMessage(msg);
+
+	i = 0;
+	while (value = vcard_get_prop(v, "email", 1, i++, 0), value != NULL) {
+
+		for (j=0; j<num_tokens(collected_addresses, ','); ++j) {
+			extract_token(addr, collected_addresses, j, ',', sizeof addr);
+
+			/* Remove the address if we already have it! */
+			process_rfc822_addr(addr, user, node, name);
+			snprintf(addr, sizeof addr, "%s@%s", user, node);
+			if (!strcasecmp(value, addr)) {
+				remove_token(collected_addresses, j, ',');
+			}
+		}
+
+	}
 
 	vcard_free(v);
+}
 
-	vcard_create_room();
+
+
+/*
+ * Back end function for store_harvested_addresses()
+ */
+void store_this_ha(struct addresses_to_be_filed *aptr) {
+	struct CtdlMessage *vmsg = NULL;
+	long vmsgnum = (-1L);
+	char *ser = NULL;
+	struct vCard *v = NULL;
+	char recipient[256];
+	int i;
+
+	/* First remove any addresses we already have in the address book */
+	usergoto(aptr->roomname, 0, 0, NULL, NULL);
+	CtdlForEachMessage(MSGS_ALL, 0, NULL, "text/x-vcard", NULL,
+		strip_addresses_already_have, aptr->collected_addresses);
+
+	if (strlen(aptr->collected_addresses) > 0)
+	   for (i=0; i<num_tokens(aptr->collected_addresses, ','); ++i) {
+
+		/* Make a vCard out of each address */
+		extract_token(recipient, aptr->collected_addresses, i, ',', sizeof recipient);
+		striplt(recipient);
+		v = vcard_new_from_rfc822_addr(recipient);
+		if (v != NULL) {
+			vmsg = malloc(sizeof(struct CtdlMessage));
+			memset(vmsg, 0, sizeof(struct CtdlMessage));
+			vmsg->cm_magic = CTDLMESSAGE_MAGIC;
+			vmsg->cm_anon_type = MES_NORMAL;
+			vmsg->cm_format_type = FMT_RFC822;
+			vmsg->cm_fields['A'] = strdup("Citadel");
+			vmsg->cm_fields['E'] =  strdup(vcard_get_prop(v, "UID", 0, 0, 0));
+			ser = vcard_serialize(v);
+			if (ser != NULL) {
+				vmsg->cm_fields['M'] = malloc(strlen(ser) + 1024);
+				sprintf(vmsg->cm_fields['M'],
+					"Content-type: text/x-vcard"
+					"\r\n\r\n%s\r\n", ser);
+				free(ser);
+			}
+			vcard_free(v);
+
+			lprintf(CTDL_DEBUG, "Adding contact: %s\n", recipient);
+			vmsgnum = CtdlSubmitMsg(vmsg, NULL, aptr->roomname);
+			CtdlFreeMessage(vmsg);
+		}
+	}
+
+	free(aptr->roomname);
+	free(aptr->collected_addresses);
+	free(aptr);
+}
+
+
+/*
+ * When a user sends a message, we may harvest one or more email addresses
+ * from the recipient list to be added to the user's address book.  But we
+ * want to do this asynchronously so it doesn't keep the user waiting.
+ */
+void store_harvested_addresses(void) {
+
+	struct addresses_to_be_filed *aptr = NULL;
+
+	if (atbf == NULL) return;
+
+	begin_critical_section(S_ATBF);
+	while (atbf != NULL) {
+		aptr = atbf;
+		atbf = atbf->next;
+		end_critical_section(S_ATBF);
+		store_this_ha(aptr);
+		begin_critical_section(S_ATBF);
+	}
+	end_critical_section(S_ATBF);
+}
+
+
+/* 
+ * Function to output vCard data as plain text.  Nobody uses MSG0 anymore, so
+ * really this is just so we expose the vCard data to the full text indexer.
+ */
+void vcard_fixed_output(char *ptr, int len) {
+	char *serialized_vcard;
+	struct vCard *v;
+	char *key, *value;
+	int i = 0;
+
+	serialized_vcard = malloc(len + 1);
+	safestrncpy(serialized_vcard, ptr, len+1);
+	v = vcard_load(serialized_vcard);
+	free(serialized_vcard);
+
+	i = 0;
+	while (key = vcard_get_prop(v, "", 0, i, 1), key != NULL) {
+		value = vcard_get_prop(v, "", 0, i++, 0);
+		cprintf("%s\n", value);
+	}
+
+	vcard_free(v);
 }
 
 
@@ -973,8 +1150,9 @@ void vcard_session_login_hook(void) {
 char *serv_vcard_init(void)
 {
 	struct ctdlroom qr;
+	char filename[256];
+	FILE *fp;
 
-	CtdlRegisterSessionHook(vcard_session_startup_hook, EVT_START);
 	CtdlRegisterSessionHook(vcard_session_login_hook, EVT_LOGIN);
 	CtdlRegisterMessageHook(vcard_upload_beforesave, EVT_BEFORESAVE);
 	CtdlRegisterMessageHook(vcard_upload_aftersave, EVT_AFTERSAVE);
@@ -987,6 +1165,8 @@ char *serv_vcard_init(void)
 	CtdlRegisterUserHook(vcard_newuser, EVT_NEWUSER);
 	CtdlRegisterUserHook(vcard_purge, EVT_PURGEUSER);
 	CtdlRegisterNetprocHook(vcard_extract_from_network);
+	CtdlRegisterSessionHook(store_harvested_addresses, EVT_TIMER);
+	CtdlRegisterFixedOutputHook("text/x-vcard", vcard_fixed_output);
 
 	/* Create the Global ADdress Book room if necessary */
 	create_room(ADDRESS_BOOK_ROOM, 3, "", 0, 1, 0, VIEW_ADDRESSBOOK);
@@ -996,7 +1176,29 @@ char *serv_vcard_init(void)
 		qr.QRep.expire_mode = EXPIRE_MANUAL;
 		qr.QRdefaultview = VIEW_ADDRESSBOOK;	/* 2 = address book view */
 		lputroom(&qr);
+
+		/*
+		 * Also make sure it has a netconfig file, so the networker runs
+		 * on this room even if we don't share it with any other nodes.
+		 * This allows the CANCEL messages (i.e. "Purge this vCard") to be
+		 * purged.
+		 */
+		assoc_file_name(filename, sizeof filename, &qr, ctdl_netcfg_dir);
+		fp = fopen(filename, "a");
+		if (fp != NULL) fclose(fp);
+		chown(filename, CTDLUID, (-1));
 	}
 
 	return "$Id$";
 }
+
+
+char *serv_postfix_tcpdict(void)
+{
+	CtdlRegisterServiceHook(config.c_pftcpdict_port,	/* Postfix */
+				NULL,
+				check_get_greeting,
+				check_get,
+				NULL);
+	return "$Id$";
+}