X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fvcard%2Fserv_vcard.c;h=dfd745255b7e31955a5ac035fe9bbe6eff484fe3;hb=c4609169aa7baf208848e72c16d33a3f892353b8;hp=d6a29a196b9f81fc490279b33510156a8eeecc8f;hpb=7dbf077f9264a939274ea672b702bcc28e8f0d9a;p=citadel.git

diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c
index d6a29a196..dfd745255 100644
--- a/citadel/modules/vcard/serv_vcard.c
+++ b/citadel/modules/vcard/serv_vcard.c
@@ -1,10 +1,16 @@
 /*
- * $Id$
- * 
  * A server-side module for Citadel which supports address book information
  * using the standard vCard format.
  * 
- * Copyright (c) 1999-2007 / released under the GNU General Public License
+ * Copyright (c) 1999-2015 by the citadel.org team
+ *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 /*
@@ -47,36 +53,32 @@
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
 #include "control.h"
-#include "room_ops.h"
 #include "user_ops.h"
-#include "policy.h"
 #include "database.h"
 #include "msgbase.h"
+#include "room_ops.h"
 #include "internet_addressing.h"
-#include "tools.h"
-#include "mime_parser.h"
-#include "vcard.h"
 #include "serv_vcard.h"
-#include "serv_ldap.h"
-
+#include "citadel_ldap.h"
 #include "ctdl_module.h"
 
-
-
 /*
  * set global flag calling for an aide to validate new users
  */
 void set_mm_valid(void) {
+	int flags = 0;
+
 	begin_critical_section(S_CONTROL);
-	get_control();
-	CitControl.MMflags = CitControl.MMflags | MM_VALID ;
-	put_control();
+	flags = CtdlGetConfigInt("MMflags");
+	flags = flags | MM_VALID ;
+	CtdlSetConfigInt("MMflags", flags);
 	end_critical_section(S_CONTROL);
 }
 
@@ -86,32 +88,33 @@ void set_mm_valid(void) {
  * Extract Internet e-mail addresses from a message containing a vCard, and
  * perform a callback for any found.
  */
-void vcard_extract_internet_addresses(struct CtdlMessage *msg,
-				void (*callback)(char *, char *) ) {
+void vcard_extract_internet_addresses(struct CtdlMessage *msg, int (*callback)(char *, char *) ) {
 	struct vCard *v;
 	char *s;
+	char *k;
 	char *addr;
 	char citadel_address[SIZ];
 	int instance = 0;
 	int found_something = 0;
 
-	if (msg->cm_fields['A'] == NULL) return;
-	if (msg->cm_fields['N'] == NULL) return;
+	if (CM_IsEmpty(msg, eAuthor)) return;
+	if (CM_IsEmpty(msg, eNodeName)) return;
 	snprintf(citadel_address, sizeof citadel_address, "%s @ %s",
-		msg->cm_fields['A'], msg->cm_fields['N']);
+		msg->cm_fields[eAuthor], msg->cm_fields[eNodeName]);
 
-	v = vcard_load(msg->cm_fields['M']);
+	v = vcard_load(msg->cm_fields[eMesageText]);
 	if (v == NULL) return;
 
 	/* Go through the vCard searching for *all* instances of
 	 * the "email;internet" key
 	 */
 	do {
-		s = vcard_get_prop(v, "email;internet", 0, instance++, 0);
-		if (s != NULL) {
+		s = vcard_get_prop(v, "email", 1, instance, 0);		/* get any 'email' field */
+		k = vcard_get_prop(v, "email", 1, instance++, 1);	/* but also learn it with attrs */
+		if ( (s != NULL) && (k != NULL) && (bmstrcasestr(k, "internet")) ) {
 			addr = strdup(s);
 			striplt(addr);
-			if (strlen(addr) > 0) {
+			if (!IsEmptyStr(addr)) {
 				if (callback != NULL) {
 					callback(addr, citadel_address);
 				}
@@ -126,35 +129,55 @@ void vcard_extract_internet_addresses(struct CtdlMessage *msg,
 
 	vcard_free(v);
 }
-
-
-
+///TODO: gettext!
+#define _(a) a
 /*
  * Callback for vcard_add_to_directory()
  * (Lotsa ugly nested callbacks.  Oh well.)
  */
-void vcard_directory_add_user(char *internet_addr, char *citadel_addr) {
+int vcard_directory_add_user(char *internet_addr, char *citadel_addr) {
+	struct CitContext *CCC = CC;
 	char buf[SIZ];
 
 	/* We have to validate that we're not stepping on someone else's
 	 * email address ... but only if we're logged in.  Otherwise it's
 	 * probably just the networker or something.
 	 */
-	if (CC->logged_in) {
-		lprintf(CTDL_DEBUG, "Checking for <%s>...\n", internet_addr);
+	if (CCC->logged_in) {
+		syslog(LOG_DEBUG, "Checking for <%s>...", internet_addr);
 		if (CtdlDirectoryLookup(buf, internet_addr, sizeof buf) == 0) {
 			if (strcasecmp(buf, citadel_addr)) {
 				/* This address belongs to someone else.
 				 * Bail out silently without saving.
 				 */
-				lprintf(CTDL_DEBUG, "DOOP!\n");
-				return;
+				syslog(LOG_DEBUG, "DOOP!");
+				
+				StrBufAppendPrintf(CCC->StatusMessage, "\n%d|", ERROR+ALREADY_EXISTS);
+				StrBufAppendBufPlain(CCC->StatusMessage, internet_addr, -1, 0);
+				StrBufAppendBufPlain(CCC->StatusMessage, HKEY("|"), 0);
+				StrBufAppendBufPlain(CCC->StatusMessage, _("Unable to add this email address again."), -1, 0);
+				StrBufAppendBufPlain(CCC->StatusMessage, HKEY("\n"), 0);
+				return 0;
 			}
 		}
 	}
-	lprintf(CTDL_INFO, "Adding %s (%s) to directory\n",
-			citadel_addr, internet_addr);
-	CtdlDirectoryAddUser(internet_addr, citadel_addr);
+	syslog(LOG_INFO, "Adding %s (%s) to directory", citadel_addr, internet_addr);
+	if (CtdlDirectoryAddUser(internet_addr, citadel_addr))
+	{
+		StrBufAppendPrintf(CCC->StatusMessage, "\n%d|", CIT_OK);
+		StrBufAppendBufPlain(CCC->StatusMessage, internet_addr, -1, 0);
+		StrBufAppendBufPlain(CCC->StatusMessage, HKEY("|"), 0);
+		StrBufAppendBufPlain(CCC->StatusMessage, _("Successfully added email address."), -1, 0);
+		return 1;
+	}
+	else
+	{
+		StrBufAppendPrintf(CCC->StatusMessage, "\n%d|", ERROR+ ILLEGAL_VALUE);
+		StrBufAppendBufPlain(CCC->StatusMessage, internet_addr, -1, 0);
+		StrBufAppendBufPlain(CCC->StatusMessage, HKEY("|"), 0);
+		StrBufAppendBufPlain(CCC->StatusMessage, _("Unable to add this email address. It does not match any local domain."), -1, 0);
+		return 0;
+	}
 }
 
 
@@ -164,16 +187,12 @@ void vcard_directory_add_user(char *internet_addr, char *citadel_addr) {
 void vcard_add_to_directory(long msgnum, void *data) {
 	struct CtdlMessage *msg;
 
-	msg = CtdlFetchMessage(msgnum, 1);
+	msg = CtdlFetchMessage(msgnum, 1, 1);
 	if (msg != NULL) {
 		vcard_extract_internet_addresses(msg, vcard_directory_add_user);
 	}
 
-#ifdef HAVE_LDAP
-	ctdl_vcard_to_ldap(msg, V2L_WRITE);
-#endif
-
-	CtdlFreeMessage(msg);
+	CM_Free(msg);
 }
 
 
@@ -187,8 +206,8 @@ void cmd_igab(char *argbuf) {
 
 	strcpy(hold_rm, CC->room.QRname);	/* save current room */
 
-	if (getroom(&CC->room, ADDRESS_BOOK_ROOM) != 0) {
-		getroom(&CC->room, hold_rm);
+	if (CtdlGetRoom(&CC->room, ADDRESS_BOOK_ROOM) != 0) {
+		CtdlGetRoom(&CC->room, hold_rm);
 		cprintf("%d cannot get address book room\n", ERROR + ROOM_NOT_FOUND);
 		return;
 	}
@@ -198,10 +217,11 @@ void cmd_igab(char *argbuf) {
 	CtdlDirectoryInit();
 
 	/* We want *all* vCards in this room */
-	CtdlForEachMessage(MSGS_ALL, 0, NULL, "^[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$",
+	NewStrBufDupAppendFlush(&CC->StatusMessage, NULL, NULL, 0);
+	CtdlForEachMessage(MSGS_ALL, 0, NULL, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$",
 		NULL, vcard_add_to_directory, NULL);
 
-	getroom(&CC->room, hold_rm);	/* return to saved room */
+	CtdlGetRoom(&CC->room, hold_rm);	/* return to saved room */
 	cprintf("%d Directory has been rebuilt.\n", CIT_OK);
 }
 
@@ -213,38 +233,53 @@ void cmd_igab(char *argbuf) {
  * Internet messages.  If there is, stick it in the buffer.
  */
 void extract_inet_email_addrs(char *emailaddrbuf, size_t emailaddrbuf_len,
-				char *secemailaddrbuf, size_t secemailaddrbuf_len,
-				struct vCard *v, int local_addrs_only) {
-	char *s, *addr;
+			      char *secemailaddrbuf, size_t secemailaddrbuf_len,
+			      struct vCard *v,
+			      int local_addrs_only)
+{
+	struct CitContext *CCC = CC;		/* put this on the stack, just for speed */
+	char *s, *k, *addr;
 	int instance = 0;
+	int IsDirectoryAddress;
 	int saved_instance = 0;
 
-	/* Go through the vCard searching for *all* instances of
-	 * the "email;internet" key
+	/* Go through the vCard searching for *all* Internet email addresses
 	 */
-	while (s = vcard_get_prop(v, "email;internet", 0, instance++, 0),  s != NULL) {
-		addr = strdup(s);
-		striplt(addr);
-		if (strlen(addr) > 0) {
-			if ( (IsDirectory(addr, 1)) || 
-			     (!local_addrs_only) ) {
-				++saved_instance;
-				if ((saved_instance == 1) && (emailaddrbuf != NULL)) {
-					safestrncpy(emailaddrbuf, addr, emailaddrbuf_len);
-				}
-				else if ((saved_instance == 2) && (secemailaddrbuf != NULL)) {
-					safestrncpy(secemailaddrbuf, addr, secemailaddrbuf_len);
-				}
-				else if ((saved_instance > 2) && (secemailaddrbuf != NULL)) {
-					if ( (strlen(addr) + strlen(secemailaddrbuf) + 2) 
-					   < secemailaddrbuf_len ) {
-						strcat(secemailaddrbuf, "|");
-						strcat(secemailaddrbuf, addr);
+	while (s = vcard_get_prop(v, "email", 1, instance, 0),  s != NULL) {
+		k = vcard_get_prop(v, "email", 1, instance, 1);
+		if ( (s != NULL) && (k != NULL) && (bmstrcasestr(k, "internet")) ) {
+			addr = strdup(s);
+			striplt(addr);
+			if (!IsEmptyStr(addr)) {
+				IsDirectoryAddress = IsDirectory(addr, 1);
+				if ( IsDirectoryAddress || !local_addrs_only)
+				{
+					++saved_instance;
+					if ((saved_instance == 1) && (emailaddrbuf != NULL)) {
+						safestrncpy(emailaddrbuf, addr, emailaddrbuf_len);
+					}
+					else if ((saved_instance == 2) && (secemailaddrbuf != NULL)) {
+						safestrncpy(secemailaddrbuf, addr, secemailaddrbuf_len);
+					}
+					else if ((saved_instance > 2) && (secemailaddrbuf != NULL)) {
+						if ( (strlen(addr) + strlen(secemailaddrbuf) + 2) 
+					   	< secemailaddrbuf_len ) {
+							strcat(secemailaddrbuf, "|");
+							strcat(secemailaddrbuf, addr);
+						}
 					}
 				}
+				if (!IsDirectoryAddress && local_addrs_only)
+				{
+					StrBufAppendPrintf(CCC->StatusMessage, "\n%d|", ERROR+ ILLEGAL_VALUE);
+					StrBufAppendBufPlain(CCC->StatusMessage, addr, -1, 0);
+					StrBufAppendBufPlain(CCC->StatusMessage, HKEY("|"), 0);
+					StrBufAppendBufPlain(CCC->StatusMessage, _("unable to add this emailaddress; its not matching our domain."), -1, 0);
+				}
 			}
+			free(addr);
 		}
-		free(addr);
+		++instance;
 	}
 }
 
@@ -258,9 +293,9 @@ void extract_friendly_name(char *namebuf, size_t namebuf_len, struct vCard *v)
 {
 	char *s;
 
-	s = vcard_get_prop(v, "fn", 0, 0, 0);
+	s = vcard_get_prop(v, "fn", 1, 0, 0);
 	if (s == NULL) {
-		s = vcard_get_prop(v, "n", 0, 0, 0);
+		s = vcard_get_prop(v, "n", 1, 0, 0);
 	}
 
 	if (s != NULL) {
@@ -274,14 +309,14 @@ void extract_friendly_name(char *namebuf, size_t namebuf_len, struct vCard *v)
  */
 void vcard_extract_vcard(char *name, char *filename, char *partnum, char *disp,
 		   void *content, char *cbtype, char *cbcharset, size_t length,
-		   char *encoding, void *cbuserdata)
+		   char *encoding, char *cbid, void *cbuserdata)
 {
 	struct vCard **v = (struct vCard **) cbuserdata;
 
 	if (  (!strcasecmp(cbtype, "text/x-vcard"))
 	   || (!strcasecmp(cbtype, "text/vcard")) ) {
 
-		lprintf(CTDL_DEBUG, "Part %s contains a vCard!  Loading...\n", partnum);
+		syslog(LOG_DEBUG, "Part %s contains a vCard!  Loading...", partnum);
 		if (*v != NULL) {
 			vcard_free(*v);
 		}
@@ -296,8 +331,8 @@ void vcard_extract_vcard(char *name, char *filename, char *partnum, char *disp,
  * function accordingly (delete the user's existing vCard in the config room
  * and in the global address book).
  */
-int vcard_upload_beforesave(struct CtdlMessage *msg) {
-	char *ptr;
+int vcard_upload_beforesave(struct CtdlMessage *msg, recptypes *recp) {
+	struct CitContext *CCC = CC;
 	char *s;
 	char buf[SIZ];
 	struct ctdluser usbuf;
@@ -308,17 +343,16 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
 	int yes_my_citadel_config = 0;
 	int yes_any_vcard_room = 0;
 
-	if (!CC->logged_in) return(0);	/* Only do this if logged in. */
+	if ((!CCC->logged_in) && (CCC->vcard_updated_by_ldap==0)) return(0);	/* Only do this if logged in, or if ldap changed the vcard. */
 
 	/* Is this some user's "My Citadel Config" room? */
-	if ( (CC->room.QRflags && QR_MAILBOX)
-	   && (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) {
+	if (((CCC->room.QRflags & QR_MAILBOX) != 0) &&
+	      (!strcasecmp(&CCC->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) {
+		/* Prevent non-aides from performing registration changes, but ldap is ok. */
+		if ((CCC->user.axlevel < AxAideU) && (CCC->vcard_updated_by_ldap==0)) {
 			return(1);
 		}
 #endif
@@ -326,7 +360,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
 	}
 
 	/* Is this a room with an address book in it? */
-	if (CC->room.QRdefaultview == VIEW_ADDRESSBOOK) {
+	if (CCC->room.QRdefaultview == VIEW_ADDRESSBOOK) {
 		yes_any_vcard_room = 1;
 	}
 
@@ -340,40 +374,42 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
 
 	/* Ok, if we got this far, look into the situation further... */
 
-	ptr = msg->cm_fields['M'];
-	if (ptr == NULL) return(0);
+	if (CM_IsEmpty(msg, eMesageText)) return(0);
 
-	mime_parser(msg->cm_fields['M'],
-		NULL,
-		*vcard_extract_vcard,
-		NULL, NULL,
-		&v,		/* user data ptr - put the vcard here */
-		0
+	mime_parser(CM_RANGE(msg, eMesageText),
+		    *vcard_extract_vcard,
+		    NULL, NULL,
+		    &v,		/* user data ptr - put the vcard here */
+		    0
 	);
 
 	if (v == NULL) return(0);	/* no vCards were found in this message */
 
 	/* If users cannot create their own accounts, they cannot re-register either. */
-	if ( (yes_my_citadel_config) && (config.c_disable_newu) && (CC->user.axlevel < 6) ) {
+	if ( (yes_my_citadel_config) &&
+	     (CtdlGetConfigInt("c_disable_newu")) &&
+	     (CCC->user.axlevel < AxAideU) &&
+	     (CCC->vcard_updated_by_ldap==0) )
+	{
 		return(1);
 	}
 
-	s = vcard_get_prop(v, "FN", 0, 0, 0);
-	if (s) lprintf(CTDL_DEBUG, "vCard beforesave hook running for <%s>\n", s);
+	vcard_get_prop(v, "fn", 1, 0, 0);
+
 
 	if (yes_my_citadel_config) {
 		/* Bingo!  The user is uploading a new vCard, so
 		 * delete the old one.  First, figure out which user
 		 * is being re-registered...
 		 */
-		what_user = atol(CC->room.QRname);
+		what_user = atol(CCC->room.QRname);
 
-		if (what_user == CC->user.usernum) {
+		if (what_user == CCC->user.usernum) {
 			/* It's the logged in user.  That was easy. */
-			memcpy(&usbuf, &CC->user, sizeof(struct ctdluser));
+			memcpy(&usbuf, &CCC->user, sizeof(struct ctdluser));
 		}
 		
-		else if (getuserbynumber(&usbuf, what_user) == 0) {
+		else if (CtdlGetUserByNumber(&usbuf, what_user) == 0) {
 			/* We fetched a valid user record */
 		}
 
@@ -390,72 +426,76 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
 		 * vCard in the user's config room at all times.
 		 *
 		 */
-		CtdlDeleteMessages(CC->room.QRname, NULL, 0, "^[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$");
+		CtdlDeleteMessages(CCC->room.QRname, NULL, 0, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$");
 
 		/* Make the author of the message the name of the user. */
-		if (msg->cm_fields['A'] != NULL) {
-			free(msg->cm_fields['A']);
+		if (!IsEmptyStr(usbuf.fullname)) {
+			CM_SetField(msg, eAuthor, usbuf.fullname, strlen(usbuf.fullname));
 		}
-		msg->cm_fields['A'] = strdup(usbuf.fullname);
 	}
 
 	/* Insert or replace RFC2739-compliant free/busy URL */
 	if (yes_my_citadel_config) {
 		sprintf(buf, "http://%s/%s.vfb",
-			config.c_fqdn,
+			CtdlGetConfigStr("c_fqdn"),
 			usbuf.fullname);
-		for (i=0; i<strlen(buf); ++i) {
+		for (i=0; buf[i]; ++i) {
 			if (buf[i] == ' ') buf[i] = '_';
 		}
 		vcard_set_prop(v, "FBURL;PREF", buf, 0);
 	}
 
-	/* If the vCard has no UID, then give it one. */
-	s = vcard_get_prop(v, "UID", 0, 0, 0);
-	if (s == NULL) {
+
+	s = vcard_get_prop(v, "UID", 1, 0, 0);
+	if (s == NULL) { /* Note LDAP auth sets UID from the LDAP UUID, use that if it exists. */
+	  /* Enforce local UID policy if applicable */
+	  if (yes_my_citadel_config) {
+		snprintf(buf, sizeof buf, VCARD_EXT_FORMAT, msg->cm_fields[eAuthor], NODENAME);
+	  } else {
+		/* If the vCard has no UID, then give it one. */
 		generate_uuid(buf);
-		vcard_set_prop(v, "UID", buf, 0);
-	}
+	  }
+ 	  vcard_set_prop(v, "UID", buf, 0);
+    }
 
-	/* Enforce local UID policy if applicable */
-	if (yes_my_citadel_config) {
-		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.
 	 */
-	if (msg->cm_fields['E'] != NULL) free(msg->cm_fields['E']);
-	s = vcard_get_prop(v, "UID", 0, 0, 0);
-	if (s != NULL) {
-		msg->cm_fields['E'] = strdup(s);
-		if (msg->cm_fields['U'] == NULL) {
-			msg->cm_fields['U'] = strdup(s);
+	CM_FlushField(msg, eExclusiveID);
+
+	s = vcard_get_prop(v, "UID", 1, 0, 0);
+	if (!IsEmptyStr(s)) {
+		CM_SetField(msg, eExclusiveID, s, strlen(s));
+		if (CM_IsEmpty(msg, eMsgSubject)) {
+			CM_CopyField(msg, eMsgSubject, eExclusiveID);
 		}
 	}
 
 	/*
 	 * Set the Subject to the name in the vCard.
 	 */
-	s = vcard_get_prop(v, "FN", 0, 0, 0);
+	s = vcard_get_prop(v, "FN", 1, 0, 0);
 	if (s == NULL) {
-		s = vcard_get_prop(v, "N", 0, 0, 0);
+		s = vcard_get_prop(v, "N", 1, 0, 0);
 	}
-	if (s != NULL) {
-		if (msg->cm_fields['U'] != NULL) {
-			free(msg->cm_fields['U']);
-		}
-		msg->cm_fields['U'] = strdup(s);
+	if (!IsEmptyStr(s)) {
+		CM_SetField(msg, eMsgSubject, s, strlen(s));
 	}
 
 	/* Re-serialize it back into the msg body */
 	ser = vcard_serialize(v);
-	if (ser != NULL) {
-		msg->cm_fields['M'] = realloc(msg->cm_fields['M'], strlen(ser) + 1024);
-		sprintf(msg->cm_fields['M'],
-			"Content-type: " VCARD_MIME_TYPE
-			"\r\n\r\n%s\r\n", ser);
+	if (!IsEmptyStr(ser)) {
+		StrBuf *buf;
+		long serlen;
+
+		serlen = strlen(ser);
+		buf = NewStrBufPlain(NULL, serlen + 1024);
+
+		StrBufAppendBufPlain(buf, HKEY("Content-type: " VCARD_MIME_TYPE "\r\n\r\n"), 0);
+		StrBufAppendBufPlain(buf, ser, serlen, 0);
+		StrBufAppendBufPlain(buf, HKEY("\r\n"), 0);
+		CM_SetAsFieldSB(msg, eMesageText, &buf);
 		free(ser);
 	}
 
@@ -472,23 +512,49 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
  * function accordingly (copy the vCard from the config room to the global
  * address book).
  */
-int vcard_upload_aftersave(struct CtdlMessage *msg) {
+int vcard_upload_aftersave(struct CtdlMessage *msg, recptypes *recp) {
+	struct CitContext *CCC = CC;
 	char *ptr;
 	int linelen;
 	long I;
 	struct vCard *v;
+	int is_UserConf=0;
+	int is_MY_UserConf=0;
+	int is_GAB=0;
+	char roomname[ROOMNAMELEN];
 
-	if (!CC->logged_in) return(0);	/* Only do this if logged in. */
-
-	/* If this isn't the configuration room, or if this isn't a MIME
-	 * message, don't bother.
-	 */
-	if (msg->cm_fields['O'] == NULL) return(0);
-	if (strcasecmp(msg->cm_fields['O'], USERCONFIGROOM)) return(0);
 	if (msg->cm_format_type != 4) return(0);
+	if ((!CCC->logged_in) && (CCC->vcard_updated_by_ldap==0)) return(0);	/* Only do this if logged in, or if ldap changed the vcard. */
+
+	/* We're interested in user config rooms only. */
+
+	if ( !IsEmptyStr(CCC->room.QRname) &&
+             (strlen(CCC->room.QRname) >= 12) &&
+             (!strcasecmp(&CCC->room.QRname[11], USERCONFIGROOM)) ) {
+		is_UserConf = 1;	/* It's someone's config room */
+	}
+	CtdlMailboxName(roomname, sizeof roomname, &CCC->user, USERCONFIGROOM);
+	if (!strcasecmp(CCC->room.QRname, roomname)) {
+		is_UserConf = 1;
+		is_MY_UserConf = 1;	/* It's MY config room */
+	}
+	if (!strcasecmp(CCC->room.QRname, ADDRESS_BOOK_ROOM)) {
+		is_GAB = 1;		/* It's the Global Address Book */
+	}
+
+	if (!is_UserConf && !is_GAB) return(0);
+
+	if (CM_IsEmpty(msg, eMesageText))
+		return 0;
+
+	ptr = msg->cm_fields[eMesageText];
+
+	CCC->vcard_updated_by_ldap=0;  /* As this will write LDAP's previous changes, disallow LDAP change auth until next LDAP change. */ 
+
+	NewStrBufDupAppendFlush(&CCC->StatusMessage, NULL, NULL, 0);
+
+	StrBufPrintf(CCC->StatusMessage, "%d\n", LISTING_FOLLOWS);
 
-	ptr = msg->cm_fields['M'];
-	if (ptr == NULL) return(0);
 	while (ptr != NULL) {
 	
 		linelen = strcspn(ptr, "\n");
@@ -501,32 +567,46 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
 			 * copy it to the Global Address Book room.
 			 */
 
-			I = atol(msg->cm_fields['I']);
-			if (I < 0L) return(0);
+			I = atol(msg->cm_fields[eVltMsgNum]);
+			if (I <= 0L) return(0);
 
 			/* Store our Internet return address in memory */
-			v = vcard_load(msg->cm_fields['M']);
-			extract_inet_email_addrs(CC->cs_inet_email, sizeof CC->cs_inet_email,
-						CC->cs_inet_other_emails, sizeof CC->cs_inet_other_emails,
+			if (is_MY_UserConf) {
+				v = vcard_load(msg->cm_fields[eMesageText]);
+				extract_inet_email_addrs(CCC->cs_inet_email, sizeof CCC->cs_inet_email,
+						CCC->cs_inet_other_emails, sizeof CCC->cs_inet_other_emails,
 						v, 1);
-			extract_friendly_name(CC->cs_inet_fn, sizeof CC->cs_inet_fn, v);
-			vcard_free(v);
+				extract_friendly_name(CCC->cs_inet_fn, sizeof CCC->cs_inet_fn, v);
+				vcard_free(v);
+			}
 
-			/* Put it in the Global Address Book room... */
-			CtdlSaveMsgPointerInRoom(ADDRESS_BOOK_ROOM, I, 1, msg);
+			if (!is_GAB)
+			{	// This is not the GAB
+				/* Put it in the Global Address Book room... */
+				CtdlSaveMsgPointerInRoom(ADDRESS_BOOK_ROOM, I, 1, msg);
+			}
 
 			/* ...and also in the directory database. */
 			vcard_add_to_directory(I, NULL);
 
 			/* Some sites want an Aide to be notified when a
-			 * user registers or re-registers...
+			 * user registers or re-registers
+			 * But if the user was an Aide or was edited by an Aide then we can
+			 * Assume they don't need validating.
 			 */
+			if (CCC->user.axlevel >= AxAideU) {
+				CtdlLockGetCurrentUser();
+				CCC->user.flags |= US_REGIS;
+				CtdlPutCurrentUserLock();
+				return (0);
+			}
+			
 			set_mm_valid();
 
 			/* ...which also means we need to flag the user */
-			lgetuser(&CC->user, CC->curr_user);
-			CC->user.flags |= (US_REGIS|US_NEEDVALID);
-			lputuser(&CC->user);
+			CtdlLockGetCurrentUser();
+			CCC->user.flags |= (US_REGIS|US_NEEDVALID);
+			CtdlPutCurrentUserLock();
 
 			return(0);
 		}
@@ -556,33 +636,34 @@ void vcard_gu_backend(long supplied_msgnum, void *userdata) {
  * and return an empty vCard.
  */
 struct vCard *vcard_get_user(struct ctdluser *u) {
+	struct CitContext *CCC = CC;
 	char hold_rm[ROOMNAMELEN];
 	char config_rm[ROOMNAMELEN];
 	struct CtdlMessage *msg = NULL;
 	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, CCC->room.QRname);	/* save current room */
+	CtdlMailboxName(config_rm, sizeof config_rm, u, USERCONFIGROOM);
 
-	if (getroom(&CC->room, config_rm) != 0) {
-		getroom(&CC->room, hold_rm);
+	if (CtdlGetRoom(&CCC->room, config_rm) != 0) {
+		CtdlGetRoom(&CCC->room, hold_rm);
 		return vcard_new();
 	}
 
 	/* We want the last (and probably only) vcard in this room */
 	VCmsgnum = (-1);
-	CtdlForEachMessage(MSGS_LAST, 1, NULL, "^[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$",
+	CtdlForEachMessage(MSGS_LAST, 1, NULL, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$",
 		NULL, vcard_gu_backend, (void *)&VCmsgnum );
-	getroom(&CC->room, hold_rm);	/* return to saved room */
+	CtdlGetRoom(&CCC->room, hold_rm);	/* return to saved room */
 
 	if (VCmsgnum < 0L) return vcard_new();
 
-	msg = CtdlFetchMessage(VCmsgnum, 1);
+	msg = CtdlFetchMessage(VCmsgnum, 1, 1);
 	if (msg == NULL) return vcard_new();
 
-	v = vcard_load(msg->cm_fields['M']);
-	CtdlFreeMessage(msg);
+	v = vcard_load(msg->cm_fields[eMesageText]);
+	CM_Free(msg);
 	return v;
 }
 
@@ -594,22 +675,13 @@ 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 *ser;
 
-	CtdlMakeTempFileName(temp, sizeof temp);
 	ser = vcard_serialize(v);
-
-	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);
+		ser = strdup("begin:vcard\r\nend:vcard\r\n");
 	}
-	fclose(fp);
+	if (ser == NULL) return;
 
 	/* This handy API function does all the work for us.
 	 * NOTE: normally we would want to set that last argument to 1, to
@@ -617,15 +689,16 @@ void vcard_write_user(struct ctdluser *u, struct vCard *v) {
 	 * 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 */
-			VCARD_MIME_TYPE,/* MIME type */
-			temp,		/* temp file */
-			u,		/* which user */
-			0,		/* not binary */
-			0,		/* don't delete others of this type */
-			0);		/* no flags */
-
-	unlink(temp);
+	CtdlWriteObject(USERCONFIGROOM,		/* which room */
+			VCARD_MIME_TYPE,	/* MIME type */
+			ser,			/* data */
+			strlen(ser)+1,		/* length */
+			u,			/* which user */
+			0,			/* not binary */
+			0,			/* don't delete others of this type */
+			0);			/* no flags */
+
+	free(ser);
 }
 
 
@@ -636,6 +709,7 @@ void vcard_write_user(struct ctdluser *u, struct vCard *v) {
  * and enters the vCard into the user's configuration.
  */
 void cmd_regi(char *argbuf) {
+	struct CitContext *CCC = CC;
 	int a,b,c;
 	char buf[SIZ];
 	struct vCard *my_vcard;
@@ -649,18 +723,18 @@ void cmd_regi(char *argbuf) {
 
 	unbuffer_output();
 
-	if (!(CC->logged_in)) {
+	if (!(CCC->logged_in)) {
 		cprintf("%d Not logged in.\n",ERROR + NOT_LOGGED_IN);
 		return;
 	}
 
 	/* If users cannot create their own accounts, they cannot re-register either. */
-	if ( (config.c_disable_newu) && (CC->user.axlevel < 6) ) {
+	if ( (CtdlGetConfigInt("c_disable_newu")) && (CCC->user.axlevel < AxAideU) ) {
 		cprintf("%d Self-service registration is not allowed here.\n",
 			ERROR + HIGHER_ACCESS_REQUIRED);
 	}
 
-	my_vcard = vcard_get_user(&CC->user);
+	my_vcard = vcard_get_user(&CCC->user);
 	strcpy(tmpaddr, "");
 	strcpy(tmpcity, "");
 	strcpy(tmpstate, "");
@@ -675,7 +749,7 @@ void cmd_regi(char *argbuf) {
 		if (a==2) strcpy(tmpcity, buf);
 		if (a==3) strcpy(tmpstate, buf);
 		if (a==4) {
-			for (c=0; c<strlen(buf); ++c) {
+			for (c=0; buf[c]; ++c) {
 				if ((buf[c]>='0') && (buf[c]<='9')) {
 					b = strlen(tmpzip);
 					tmpzip[b] = buf[c];
@@ -683,7 +757,7 @@ void cmd_regi(char *argbuf) {
 				}
 			}
 		}
-		if (a==5) vcard_set_prop(my_vcard, "tel;home", buf, 0);
+		if (a==5) vcard_set_prop(my_vcard, "tel", buf, 0);
 		if (a==6) vcard_set_prop(my_vcard, "email;internet", buf, 0);
 		if (a==7) strcpy(tmpcountry, buf);
 		++a;
@@ -692,7 +766,7 @@ void cmd_regi(char *argbuf) {
 	snprintf(tmpaddress, sizeof tmpaddress, ";;%s;%s;%s;%s;%s",
 		tmpaddr, tmpcity, tmpstate, tmpzip, tmpcountry);
 	vcard_set_prop(my_vcard, "adr", tmpaddress, 0);
-	vcard_write_user(&CC->user, my_vcard);
+	vcard_write_user(&CCC->user, my_vcard);
 	vcard_free(my_vcard);
 }
 
@@ -702,6 +776,7 @@ void cmd_regi(char *argbuf) {
  */
 void cmd_greg(char *argbuf)
 {
+	struct CitContext *CCC = CC;
 	struct ctdluser usbuf;
 	struct vCard *v;
 	char *s;
@@ -711,20 +786,20 @@ void cmd_greg(char *argbuf)
 
 	extract_token(who, argbuf, 0, '|', sizeof who);
 
-	if (!(CC->logged_in)) {
+	if (!(CCC->logged_in)) {
 		cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
 		return;
 	}
 
-	if (!strcasecmp(who,"_SELF_")) strcpy(who,CC->curr_user);
+	if (!strcasecmp(who,"_SELF_")) strcpy(who,CCC->curr_user);
 
-	if ((CC->user.axlevel < 6) && (strcasecmp(who,CC->curr_user))) {
+	if ((CCC->user.axlevel < AxAideU) && (strcasecmp(who,CCC->curr_user))) {
 		cprintf("%d Higher access required.\n",
 			ERROR + HIGHER_ACCESS_REQUIRED);
 		return;
 	}
 
-	if (getuser(&usbuf, who) != 0) {
+	if (CtdlGetUser(&usbuf, who) != 0) {
 		cprintf("%d '%s' not found.\n", ERROR + NO_SUCH_USER, who);
 		return;
 	}
@@ -734,10 +809,10 @@ void cmd_greg(char *argbuf)
 	cprintf("%d %s\n", LISTING_FOLLOWS, usbuf.fullname);
 	cprintf("%ld\n", usbuf.usernum);
 	cprintf("%s\n", usbuf.password);
-	s = vcard_get_prop(v, "n", 0, 0, 0);
+	s = vcard_get_prop(v, "n", 1, 0, 0);
 	cprintf("%s\n", s ? s : " ");	/* name */
 
-	s = vcard_get_prop(v, "adr", 0, 0, 0);
+	s = vcard_get_prop(v, "adr", 1, 0, 0);
 	snprintf(adr, sizeof adr, "%s", s ? s : " ");/* address... */
 
 	extract_token(buf, adr, 2, ';', sizeof buf);
@@ -749,7 +824,7 @@ void cmd_greg(char *argbuf)
 	extract_token(buf, adr, 5, ';', sizeof buf);
 	cprintf("%s\n", buf);				/* zip */
 
-	s = vcard_get_prop(v, "tel;home", 0, 0, 0);
+	s = vcard_get_prop(v, "tel", 1, 0, 0);
 	if (s == NULL) s = vcard_get_prop(v, "tel", 1, 0, 0);
 	if (s != NULL) {
 		cprintf("%s\n", s);
@@ -781,21 +856,70 @@ void vcard_newuser(struct ctdluser *usbuf) {
 	char buf[256];
 	int i;
 	struct vCard *v;
+	int need_default_vcard;
 
+	need_default_vcard =1;
 	vcard_fn_to_n(vname, usbuf->fullname, sizeof vname);
-	lprintf(CTDL_DEBUG, "Converted <%s> to <%s>\n", usbuf->fullname, vname);
+	syslog(LOG_DEBUG, "Converted <%s> to <%s>", usbuf->fullname, vname);
 
 	/* Create and save the vCard */
 	v = vcard_new();
 	if (v == NULL) return;
-	sprintf(buf, "%s@%s", usbuf->fullname, config.c_fqdn);
-	for (i=0; i<strlen(buf); ++i) {
-		if (buf[i] == ' ') buf[i] = '_';
-	}
 	vcard_add_prop(v, "fn", usbuf->fullname);
 	vcard_add_prop(v, "n", vname);
 	vcard_add_prop(v, "adr", "adr:;;_;_;_;00000;__");
-	vcard_add_prop(v, "email;internet", buf);
+
+#ifdef HAVE_GETPWUID_R
+	/* If using host auth mode, we add an email address based on the login */
+	if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_HOST) {
+		struct passwd pwd;
+		char pwd_buffer[SIZ];
+		
+#ifdef SOLARIS_GETPWUID
+		if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer) != NULL) {
+#else // SOLARIS_GETPWUID
+		struct passwd *result = NULL;
+		syslog(LOG_DEBUG, "Searching for uid %d", usbuf->uid);
+		if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer, &result) == 0) {
+#endif // HAVE_GETPWUID_R
+			snprintf(buf, sizeof buf, "%s@%s", pwd.pw_name, CtdlGetConfigStr("c_fqdn"));
+			vcard_add_prop(v, "email;internet", buf);
+			need_default_vcard = 0;
+		}
+	}
+#endif
+
+
+#ifdef HAVE_LDAP
+	/*
+	 * Is this an LDAP session?  If so, copy various LDAP attributes from the directory entry
+	 * into the user's vCard.
+	 */
+	if ((CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP) || (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP_AD)) {
+            //uid_t ldap_uid;
+	    int found_user;
+            char ldap_cn[512];
+            char ldap_dn[512];
+	    found_user = CtdlTryUserLDAP(usbuf->fullname, ldap_dn, sizeof ldap_dn, ldap_cn, sizeof ldap_cn, &usbuf->uid,1);
+            if (found_user == 0) {
+		if (Ctdl_LDAP_to_vCard(ldap_dn, v)) {
+			/* Allow global address book and internet directory update without login long enough to write this. */
+			CC->vcard_updated_by_ldap++;  /* Otherwise we'll only update the user config. */
+			need_default_vcard = 0;
+			syslog(LOG_DEBUG, "LDAP Created Initial Vcard for %s\n",usbuf->fullname);
+		}
+	    }
+	}
+#endif
+	if (need_default_vcard!=0) {
+	  /* Everyone gets an email address based on their display name */
+	  snprintf(buf, sizeof buf, "%s@%s", usbuf->fullname, CtdlGetConfigStr("c_fqdn"));
+	  for (i=0; buf[i]; ++i) {
+		if (buf[i] == ' ') buf[i] = '_';
+	  }
+	  vcard_add_prop(v, "email;internet", buf);
+    }
+
 	vcard_write_user(usbuf, v);
 	vcard_free(v);
 }
@@ -809,6 +933,7 @@ void vcard_newuser(struct ctdluser *usbuf) {
 void vcard_purge(struct ctdluser *usbuf) {
 	struct CtdlMessage *msg;
 	char buf[SIZ];
+	long len;
 
 	msg = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage));
 	if (msg == NULL) return;
@@ -817,19 +942,21 @@ void vcard_purge(struct ctdluser *usbuf) {
 	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");
+	if (!IsEmptyStr(usbuf->fullname)) {
+		CM_SetField(msg, eAuthor, usbuf->fullname, strlen(usbuf->fullname));
+	}
+	CM_SetField(msg, eOriginalRoom, HKEY(ADDRESS_BOOK_ROOM));
+	CM_SetField(msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename")));
+	CM_SetField(msg, eMesageText, HKEY("Purge this vCard\n"));
 
-	snprintf(buf, sizeof buf, VCARD_EXT_FORMAT,
-			msg->cm_fields['A'], NODENAME);
-	msg->cm_fields['E'] = strdup(buf);
+	len = snprintf(buf, sizeof buf, VCARD_EXT_FORMAT,
+		       msg->cm_fields[eAuthor], NODENAME);
+	CM_SetField(msg, eExclusiveID, buf, len);
 
-	msg->cm_fields['S'] = strdup("CANCEL");
+	CM_SetField(msg, eSpecialField, HKEY("CANCEL"));
 
-	CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM);
-	CtdlFreeMessage(msg);
+	CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM, QP_EADDR);
+	CM_Free(msg);
 }
 
 
@@ -848,8 +975,11 @@ int vcard_extract_from_network(struct CtdlMessage *msg, char *target_room) {
 
 	if (msg->cm_format_type != 4) return(0);
 
-	ptr = msg->cm_fields['M'];
-	if (ptr == NULL) return(0);
+	if (CM_IsEmpty(msg, eMesageText))
+		return 0;
+
+	ptr = msg->cm_fields[eMesageText];
+
 	while (ptr != NULL) {
 	
 		linelen = strcspn(ptr, "\n");
@@ -881,16 +1011,21 @@ void vcard_delete_remove(char *room, long msgnum) {
 	int linelen;
 
 	if (msgnum <= 0L) return;
+	
+	if (room == NULL) return;
 
 	if (strcasecmp(room, ADDRESS_BOOK_ROOM)) {
 		return;
 	}
 
-	msg = CtdlFetchMessage(msgnum, 1);
+	msg = CtdlFetchMessage(msgnum, 1, 1);
 	if (msg == NULL) return;
 
-	ptr = msg->cm_fields['M'];
-	if (ptr == NULL) goto EOH;
+	if (CM_IsEmpty(msg, eMesageText))
+		goto EOH;
+
+	ptr = msg->cm_fields[eMesageText];
+
 	while (ptr != NULL) {
 		linelen = strcspn(ptr, "\n");
 		if (linelen == 0) goto EOH;
@@ -899,15 +1034,12 @@ void vcard_delete_remove(char *room, long msgnum) {
 		   || (!strncasecmp(ptr, "Content-type: text/vcard", 24)) ) {
 			/* Bingo!  A vCard is being deleted. */
 			vcard_extract_internet_addresses(msg, CtdlDirectoryDelUser);
-#ifdef HAVE_LDAP
-			ctdl_vcard_to_ldap(msg, V2L_DELETE);
-#endif
 		}
 		ptr = strchr((char *)ptr, '\n');
 		if (ptr != NULL) ++ptr;
 	}
 
-EOH:	CtdlFreeMessage(msg);
+EOH:	CM_Free(msg);
 }
 
 
@@ -917,12 +1049,14 @@ EOH:	CtdlFreeMessage(msg);
  */
 void cmd_gvsn(char *argbuf)
 {
+	struct CitContext *CCC = CC;
+
 	if (CtdlAccessCheck(ac_logged_in)) return;
 
 	cprintf("%d valid screen names:\n", LISTING_FOLLOWS);
-	cprintf("%s\n", CC->user.fullname);
-	if ( (strlen(CC->cs_inet_fn) > 0) && (strcasecmp(CC->user.fullname, CC->cs_inet_fn)) ) {
-		cprintf("%s\n", CC->cs_inet_fn);
+	cprintf("%s\n", CCC->user.fullname);
+	if ( (!IsEmptyStr(CCC->cs_inet_fn)) && (strcasecmp(CCC->user.fullname, CCC->cs_inet_fn)) ) {
+		cprintf("%s\n", CCC->cs_inet_fn);
 	}
 	cprintf("000\n");
 }
@@ -933,6 +1067,7 @@ void cmd_gvsn(char *argbuf)
  */
 void cmd_gvea(char *argbuf)
 {
+	struct CitContext *CCC = CC;
 	int num_secondary_emails = 0;
 	int i;
 	char buf[256];
@@ -940,13 +1075,13 @@ void cmd_gvea(char *argbuf)
 	if (CtdlAccessCheck(ac_logged_in)) return;
 
 	cprintf("%d valid email addresses:\n", LISTING_FOLLOWS);
-	if (strlen(CC->cs_inet_email) > 0) {
-		cprintf("%s\n", CC->cs_inet_email);
+	if (!IsEmptyStr(CCC->cs_inet_email)) {
+		cprintf("%s\n", CCC->cs_inet_email);
 	}
-	if (strlen(CC->cs_inet_other_emails) > 0) {
-		num_secondary_emails = num_tokens(CC->cs_inet_other_emails, '|');
+	if (!IsEmptyStr(CCC->cs_inet_other_emails)) {
+		num_secondary_emails = num_tokens(CCC->cs_inet_other_emails, '|');
 		for (i=0; i<num_secondary_emails; ++i) {
-			extract_token(buf, CC->cs_inet_other_emails,i,'|',sizeof CC->cs_inet_other_emails);
+			extract_token(buf, CCC->cs_inet_other_emails,i,'|',sizeof CCC->cs_inet_other_emails);
 			cprintf("%s\n", buf);
 		}
 	}
@@ -962,12 +1097,12 @@ void cmd_gvea(char *argbuf)
  */
 void dvca_mime_callback(char *name, char *filename, char *partnum, char *disp,
 		void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
-		void *cbuserdata) {
+		char *cbid, void *cbuserdata) {
 
 	struct vCard *v;
-	char displayname[256];
+	char displayname[256] = "";
 	int displayname_len;
-	char emailaddr[256];
+	char emailaddr[256] = "";
 	int i;
 	int has_commas = 0;
 
@@ -1010,16 +1145,15 @@ void dvca_mime_callback(char *name, char *filename, char *partnum, char *disp,
 void dvca_callback(long msgnum, void *userdata) {
 	struct CtdlMessage *msg = NULL;
 
-	msg = CtdlFetchMessage(msgnum, 1);
+	msg = CtdlFetchMessage(msgnum, 1, 1);
 	if (msg == NULL) return;
-	mime_parser(msg->cm_fields['M'],
-		NULL,
-		*dvca_mime_callback,	/* callback function */
-		NULL, NULL,
-		NULL,			/* user data */
-		0
-	);
-	CtdlFreeMessage(msg);
+	mime_parser(CM_RANGE(msg, eMesageText),
+		    *dvca_mime_callback,	/* callback function */
+		    NULL, NULL,
+		    NULL,			/* user data */
+		    0
+		);
+	CM_Free(msg);
 }
 
 
@@ -1067,20 +1201,21 @@ void check_get(void) {
 	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;
+		syslog(LOG_CRIT, "vcard client disconnected: ending session.");
+		CC->kill_me = KILLME_CLIENT_DISCONNECTED;
 		return;
 	}
-	lprintf(CTDL_INFO, ": %s\n", cmdbuf);
+	syslog(LOG_INFO, ": %s", cmdbuf);
 	while (strlen(cmdbuf) < 3) strcat(cmdbuf, " ");
-
-	if (strcasecmp(cmdbuf, "GET "));
+	syslog(LOG_INFO, "[ %s]", cmdbuf);
+	
+	if (strncasecmp(cmdbuf, "GET ", 4)==0)
 	{
-		struct recptypes *rcpt;
+		recptypes *rcpt;
 		char *argbuf = &cmdbuf[4];
 		
 		extract_token(internet_addr, argbuf, 0, '|', sizeof internet_addr);
-		rcpt = validate_recipients(internet_addr);
+		rcpt = validate_recipients(internet_addr, NULL, CHECK_EXISTANCE);
 		if ((rcpt != NULL)&&
 			(
 			 (*rcpt->recp_local != '\0')||
@@ -1089,15 +1224,20 @@ void check_get(void) {
 		{
 
 			cprintf("200 OK %s\n", internet_addr);
-			lprintf(CTDL_INFO, "sending 200 OK for the room %s\n", rcpt->display_recp);
+			syslog(LOG_INFO, "sending 200 OK for the room %s", 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);
+			syslog(LOG_INFO, "sending 500 REJECT no one here by that name: %s", internet_addr);
 		}
-		if (rcpt != NULL) free_recipients(rcpt);
+		if (rcpt != NULL) 
+			free_recipients(rcpt);
+	}
+	else {
+		cprintf("500 REJECT invalid Query.\n");
+		syslog(LOG_INFO, "sending 500 REJECT invalid query: %s", internet_addr);
 	}
 }
 
@@ -1109,22 +1249,22 @@ void check_get_greeting(void) {
 /*
  * We don't know if the Contacts room exists so we just create it at login
  */
-void vcard_create_room(void)
+void vcard_CtdlCreateRoom(void)
 {
 	struct ctdlroom qr;
-	struct visit vbuf;
+	visit vbuf;
 
 	/* Create the calendar room if it doesn't already exist */
-	create_room(USERCONTACTSROOM, 4, "", 0, 1, 0, VIEW_ADDRESSBOOK);
+	CtdlCreateRoom(USERCONTACTSROOM, 4, "", 0, 1, 0, VIEW_ADDRESSBOOK);
 
 	/* Set expiration policy to manual; otherwise objects will be lost! */
-	if (lgetroom(&qr, USERCONTACTSROOM)) {
-		lprintf(CTDL_ERR, "Couldn't get the user CONTACTS room!\n");
+	if (CtdlGetRoomLock(&qr, USERCONTACTSROOM)) {
+		syslog(LOG_ERR, "Couldn't get the user CONTACTS room!");
 		return;
 	}
 	qr.QRep.expire_mode = EXPIRE_MANUAL;
 	qr.QRdefaultview = VIEW_ADDRESSBOOK;	/* 2 = address book view */
-	lputroom(&qr);
+	CtdlPutRoomLock(&qr);
 
 	/* Set the view to a calendar view */
 	CtdlGetRelationship(&vbuf, &CC->user, &qr);
@@ -1142,15 +1282,43 @@ void vcard_create_room(void)
  */
 void vcard_session_login_hook(void) {
 	struct vCard *v = NULL;
+	struct CitContext *CCC = CC;		/* put this on the stack, just for speed */
 
-	v = vcard_get_user(&CC->user);
-	extract_inet_email_addrs(CC->cs_inet_email, sizeof CC->cs_inet_email,
-				CC->cs_inet_other_emails, sizeof CC->cs_inet_other_emails,
-				v, 1);
-	extract_friendly_name(CC->cs_inet_fn, sizeof CC->cs_inet_fn, v);
-	vcard_free(v);
+#ifdef HAVE_LDAP
+	/*
+	 * Is this an LDAP session?  If so, copy various LDAP attributes from the directory entry
+	 * into the user's vCard.
+	 */
+	if ((CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP) || (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP_AD)) {
+		v = vcard_get_user(&CCC->user);
+		if (v) {
+			if (Ctdl_LDAP_to_vCard(CCC->ldap_dn, v)) {
+				CCC->vcard_updated_by_ldap++; /* Make sure changes make it to the global address book and internet directory, not just the user config. */
+				syslog(LOG_DEBUG, "LDAP Detected vcard change.\n");
+				vcard_write_user(&CCC->user, v);
+			}
+		}
+	}
+#endif
+
+	/*
+	 * Extract from the user's vCard, any Internet email addresses and the user's real name.
+	 * These are inserted into the session data for various message entry commands to use.
+	 */
+	v = vcard_get_user(&CCC->user);
+	if (v) {
+		extract_inet_email_addrs(CCC->cs_inet_email, sizeof CCC->cs_inet_email,
+					CCC->cs_inet_other_emails, sizeof CCC->cs_inet_other_emails,
+					v, 1
+		);
+		extract_friendly_name(CCC->cs_inet_fn, sizeof CCC->cs_inet_fn, v);
+		vcard_free(v);
+	}
 
-	vcard_create_room();
+	/*
+	 * Create the user's 'Contacts' room (personal address book) if it doesn't already exist.
+	 */
+	vcard_CtdlCreateRoom();
 }
 
 
@@ -1176,7 +1344,7 @@ struct vCard *vcard_new_from_rfc822_addr(char *addr) {
 	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) {
+	for (i=0; uid[i]; ++i) {
 		if (isspace(uid[i])) uid[i] = '_';
 		uid[i] = tolower(uid[i]);
 	}
@@ -1201,10 +1369,10 @@ void strip_addresses_already_have(long msgnum, void *userdata) {
 
 	collected_addresses = (char *)userdata;
 
-	msg = CtdlFetchMessage(msgnum, 1);
+	msg = CtdlFetchMessage(msgnum, 1, 1);
 	if (msg == NULL) return;
-	v = vcard_load(msg->cm_fields['M']);
-	CtdlFreeMessage(msg);
+	v = vcard_load(msg->cm_fields[eMesageText]);
+	CM_Free(msg);
 
 	i = 0;
 	while (value = vcard_get_prop(v, "email", 1, i++, 0), value != NULL) {
@@ -1232,18 +1400,17 @@ void strip_addresses_already_have(long msgnum, void *userdata) {
  */
 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, "^[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$", NULL,
+	CtdlUserGoto(aptr->roomname, 0, 0, NULL, NULL, NULL, NULL);
+	CtdlForEachMessage(MSGS_ALL, 0, NULL, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$", NULL,
 		strip_addresses_already_have, aptr->collected_addresses);
 
-	if (strlen(aptr->collected_addresses) > 0)
+	if (!IsEmptyStr(aptr->collected_addresses))
 	   for (i=0; i<num_tokens(aptr->collected_addresses, ','); ++i) {
 
 		/* Make a vCard out of each address */
@@ -1251,26 +1418,36 @@ void store_this_ha(struct addresses_to_be_filed *aptr) {
 		striplt(recipient);
 		v = vcard_new_from_rfc822_addr(recipient);
 		if (v != NULL) {
+			const char *s;
 			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));
+			CM_SetField(vmsg, eAuthor, HKEY("Citadel"));
+			s = vcard_get_prop(v, "UID", 1, 0, 0);
+			if (!IsEmptyStr(s)) {
+				CM_SetField(vmsg, eExclusiveID, s, strlen(s));
+			}
 			ser = vcard_serialize(v);
 			if (ser != NULL) {
-				vmsg->cm_fields['M'] = malloc(strlen(ser) + 1024);
-				sprintf(vmsg->cm_fields['M'],
-					"Content-type: " VCARD_MIME_TYPE
-					"\r\n\r\n%s\r\n", ser);
+				StrBuf *buf;
+				long serlen;
+				
+				serlen = strlen(ser);
+				buf = NewStrBufPlain(NULL, serlen + 1024);
+
+				StrBufAppendBufPlain(buf, HKEY("Content-type: " VCARD_MIME_TYPE "\r\n\r\n"), 0);
+				StrBufAppendBufPlain(buf, ser, serlen, 0);
+				StrBufAppendBufPlain(buf, HKEY("\r\n"), 0);
+				CM_SetAsFieldSB(vmsg, eMesageText, &buf);
 				free(ser);
 			}
 			vcard_free(v);
 
-			lprintf(CTDL_DEBUG, "Adding contact: %s\n", recipient);
-			vmsgnum = CtdlSubmitMsg(vmsg, NULL, aptr->roomname);
-			CtdlFreeMessage(vmsg);
+			syslog(LOG_DEBUG, "Adding contact: %s", recipient);
+			CtdlSubmitMsg(vmsg, NULL, aptr->roomname, QP_EADDR);
+			CM_Free(vmsg);
 		}
 	}
 
@@ -1328,61 +1505,72 @@ void vcard_fixed_output(char *ptr, int len) {
 }
 
 
-
+const char *CitadelServiceDICT_TCP="DICT_TCP";
 
 CTDL_MODULE_INIT(vcard)
 {
 	struct ctdlroom qr;
 	char filename[256];
 	FILE *fp;
+	int rv = 0;
 
-	CtdlRegisterSessionHook(vcard_session_login_hook, EVT_LOGIN);
-	CtdlRegisterMessageHook(vcard_upload_beforesave, EVT_BEFORESAVE);
-	CtdlRegisterMessageHook(vcard_upload_aftersave, EVT_AFTERSAVE);
-	CtdlRegisterDeleteHook(vcard_delete_remove);
-	CtdlRegisterProtoHook(cmd_regi, "REGI", "Enter registration info");
-	CtdlRegisterProtoHook(cmd_greg, "GREG", "Get registration info");
-	CtdlRegisterProtoHook(cmd_igab, "IGAB",
-					"Initialize Global Address Book");
-	CtdlRegisterProtoHook(cmd_qdir, "QDIR", "Query Directory");
-	CtdlRegisterProtoHook(cmd_gvsn, "GVSN", "Get Valid Screen Names");
-	CtdlRegisterProtoHook(cmd_gvea, "GVEA", "Get Valid Email Addresses");
-	CtdlRegisterProtoHook(cmd_dvca, "DVCA", "Dump VCard Addresses");
-	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);
-	CtdlRegisterFixedOutputHook("text/vcard", vcard_fixed_output);
-
-	/* Create the Global ADdress Book room if necessary */
-	create_room(ADDRESS_BOOK_ROOM, 3, "", 0, 1, 0, VIEW_ADDRESSBOOK);
+	if (!threading)
+	{
+		CtdlRegisterSessionHook(vcard_session_login_hook, EVT_LOGIN, PRIO_LOGIN + 70);
+		CtdlRegisterMessageHook(vcard_upload_beforesave, EVT_BEFORESAVE);
+		CtdlRegisterMessageHook(vcard_upload_aftersave, EVT_AFTERSAVE);
+		CtdlRegisterDeleteHook(vcard_delete_remove);
+		CtdlRegisterProtoHook(cmd_regi, "REGI", "Enter registration info");
+		CtdlRegisterProtoHook(cmd_greg, "GREG", "Get registration info");
+		CtdlRegisterProtoHook(cmd_igab, "IGAB", "Initialize Global Address Book");
+		CtdlRegisterProtoHook(cmd_qdir, "QDIR", "Query Directory");
+		CtdlRegisterProtoHook(cmd_gvsn, "GVSN", "Get Valid Screen Names");
+		CtdlRegisterProtoHook(cmd_gvea, "GVEA", "Get Valid Email Addresses");
+		CtdlRegisterProtoHook(cmd_dvca, "DVCA", "Dump VCard Addresses");
+		CtdlRegisterUserHook(vcard_newuser, EVT_NEWUSER);
+		CtdlRegisterUserHook(vcard_purge, EVT_PURGEUSER);
+		CtdlRegisterNetprocHook(vcard_extract_from_network);
+		CtdlRegisterSessionHook(store_harvested_addresses, EVT_TIMER, PRIO_CLEANUP + 470);
+		CtdlRegisterFixedOutputHook("text/x-vcard", vcard_fixed_output);
+		CtdlRegisterFixedOutputHook("text/vcard", vcard_fixed_output);
+
+		/* Create the Global ADdress Book room if necessary */
+		CtdlCreateRoom(ADDRESS_BOOK_ROOM, 3, "", 0, 1, 0, VIEW_ADDRESSBOOK);
+
+		/* Set expiration policy to manual; otherwise objects will be lost! */
+		if (!CtdlGetRoomLock(&qr, ADDRESS_BOOK_ROOM)) {
+			qr.QRep.expire_mode = EXPIRE_MANUAL;
+			qr.QRdefaultview = VIEW_ADDRESSBOOK;	/* 2 = address book view */
+			CtdlPutRoomLock(&qr);
 
-	/* Set expiration policy to manual; otherwise objects will be lost! */
-	if (!lgetroom(&qr, ADDRESS_BOOK_ROOM)) {
-		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));
-	}
+			/*
+			 * 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);
+			rv = chown(filename, CTDLUID, (-1));
+			if (rv == -1)
+				syslog(LOG_EMERG, "Failed to adjust ownership of: %s [%s]", 
+				       filename, strerror(errno));
+			rv = chmod(filename, 0600);
+			if (rv == -1)
+				syslog(LOG_EMERG, "Failed to adjust ownership of: %s [%s]", 
+				       filename, strerror(errno));
+		}
 
-	/* for postfix tcpdict */
-	CtdlRegisterServiceHook(config.c_pftcpdict_port,	/* Postfix */
-				NULL,
-				check_get_greeting,
-				check_get,
-				NULL);
+		/* for postfix tcpdict */
+		CtdlRegisterServiceHook(CtdlGetConfigInt("c_pftcpdict_port"),	/* Postfix */
+					NULL,
+					check_get_greeting,
+					check_get,
+					NULL,
+					CitadelServiceDICT_TCP);
+	}
 	
-	/* return our Subversion id for the Log */
-	return "$Id$";
+	/* return our module name for the log */
+	return "vcard";
 }