X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fvcard%2Fserv_vcard.c;h=39820f7762dc7a821609c060995ec6ecb99c77c0;hb=4db4fc48793f3680c5defd28ea32c97044a2b569;hp=9505ba1852efd110e7dca1a496878bfa3ccaf0d4;hpb=62ef1542cefd2c2ff068a8b65d86d2e2a41c5ad8;p=citadel.git

diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c
index 9505ba185..39820f776 100644
--- a/citadel/modules/vcard/serv_vcard.c
+++ b/citadel/modules/vcard/serv_vcard.c
@@ -63,6 +63,7 @@
 #include "user_ops.h"
 #include "database.h"
 #include "msgbase.h"
+#include "room_ops.h"
 #include "internet_addressing.h"
 #include "serv_vcard.h"
 #include "citadel_ldap.h"
@@ -94,12 +95,12 @@ void vcard_extract_internet_addresses(struct CtdlMessage *msg, int (*callback)(c
 	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
@@ -189,7 +190,7 @@ void vcard_add_to_directory(long msgnum, void *data) {
 		vcard_extract_internet_addresses(msg, vcard_directory_add_user);
 	}
 
-	CtdlFreeMessage(msg);
+	CM_Free(msg);
 }
 
 
@@ -328,8 +329,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;
@@ -340,17 +341,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 < AxAideU) {
+		/* 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
@@ -358,7 +358,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;
 	}
 
@@ -372,36 +372,39 @@ 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 < AxAideU) ) {
+	if ( (yes_my_citadel_config) &&
+	     (config.c_disable_newu) &&
+	     (CCC->user.axlevel < AxAideU) &&
+	     (CCC->vcard_updated_by_ldap==0) )
+	{
 		return(1);
 	}
 
 	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 (CtdlGetUserByNumber(&usbuf, what_user) == 0) {
@@ -421,13 +424,10 @@ 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']);
-		}
-		msg->cm_fields['A'] = strdup(usbuf.fullname);
+		CM_SetField(msg, eAuthor, usbuf.fullname, strlen(usbuf.fullname));
 	}
 
 	/* Insert or replace RFC2739-compliant free/busy URL */
@@ -441,32 +441,30 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
 		vcard_set_prop(v, "FBURL;PREF", buf, 0);
 	}
 
-	/* If the vCard has no UID, then give it one. */
+
 	s = vcard_get_prop(v, "UID", 1, 0, 0);
-	if (s == NULL) {
+	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']);
-		msg->cm_fields['E'] = NULL;
-	}
+	CM_FlushField(msg, eExclusiveID);
+
 	s = vcard_get_prop(v, "UID", 1, 0, 0);
 	if (s != NULL) {
-		msg->cm_fields['E'] = strdup(s);
-		if (msg->cm_fields['U'] == NULL) {
-			msg->cm_fields['U'] = strdup(s);
+		CM_SetField(msg, eExclusiveID, s, strlen(s));
+		if (CM_IsEmpty(msg, eMsgSubject)) {
+			CM_CopyField(msg, eMsgSubject, eExclusiveID);
 		}
 	}
 
@@ -478,19 +476,22 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
 		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);
+		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);
+		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);
 	}
 
@@ -507,7 +508,8 @@ 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;
@@ -518,30 +520,34 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
 	char roomname[ROOMNAMELEN];
 
 	if (msg->cm_format_type != 4) return(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. */
 
 	/* We're interested in user config rooms only. */
 
-	if ( (strlen(CC->room.QRname) >= 12) && (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) {
+	if ( (strlen(CCC->room.QRname) >= 12) && (!strcasecmp(&CCC->room.QRname[11], USERCONFIGROOM)) ) {
 		is_UserConf = 1;	/* It's someone's config room */
 	}
-	CtdlMailboxName(roomname, sizeof roomname, &CC->user, USERCONFIGROOM);
-	if (!strcasecmp(CC->room.QRname, roomname)) {
+	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(CC->room.QRname, ADDRESS_BOOK_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);
 
-	ptr = msg->cm_fields['M'];
-	if (ptr == NULL) return(0);
+	if (CM_IsEmpty(msg, eMesageText))
+		return 0;
 
-	NewStrBufDupAppendFlush(&CC->StatusMessage, NULL, NULL, 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. */ 
 
-	StrBufPrintf(CC->StatusMessage, "%d\n", LISTING_FOLLOWS);
+	NewStrBufDupAppendFlush(&CCC->StatusMessage, NULL, NULL, 0);
+
+	StrBufPrintf(CCC->StatusMessage, "%d\n", LISTING_FOLLOWS);
 
 	while (ptr != NULL) {
 	
@@ -555,16 +561,16 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
 			 * copy it to the Global Address Book room.
 			 */
 
-			I = atol(msg->cm_fields['3']);
+			I = atol(msg->cm_fields[eVltMsgNum]);
 			if (I <= 0L) return(0);
 
 			/* Store our Internet return address in memory */
 			if (is_MY_UserConf) {
-				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,
+				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);
+				extract_friendly_name(CCC->cs_inet_fn, sizeof CCC->cs_inet_fn, v);
 				vcard_free(v);
 			}
 
@@ -582,19 +588,19 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
 			 * But if the user was an Aide or was edited by an Aide then we can
 			 * Assume they don't need validating.
 			 */
-			if (CC->user.axlevel >= AxAideU) {
-				CtdlGetUserLock(&CC->user, CC->curr_user);
-				CC->user.flags |= US_REGIS;
-				CtdlPutUserLock(&CC->user);
+			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 */
-			CtdlGetUserLock(&CC->user, CC->curr_user);
-			CC->user.flags |= (US_REGIS|US_NEEDVALID);
-			CtdlPutUserLock(&CC->user);
+			CtdlLockGetCurrentUser();
+			CCC->user.flags |= (US_REGIS|US_NEEDVALID);
+			CtdlPutCurrentUserLock();
 
 			return(0);
 		}
@@ -624,17 +630,18 @@ 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 */
+	strcpy(hold_rm, CCC->room.QRname);	/* save current room */
 	CtdlMailboxName(config_rm, sizeof config_rm, u, USERCONFIGROOM);
 
-	if (CtdlGetRoom(&CC->room, config_rm) != 0) {
-		CtdlGetRoom(&CC->room, hold_rm);
+	if (CtdlGetRoom(&CCC->room, config_rm) != 0) {
+		CtdlGetRoom(&CCC->room, hold_rm);
 		return vcard_new();
 	}
 
@@ -642,15 +649,15 @@ struct vCard *vcard_get_user(struct ctdluser *u) {
 	VCmsgnum = (-1);
 	CtdlForEachMessage(MSGS_LAST, 1, NULL, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$",
 		NULL, vcard_gu_backend, (void *)&VCmsgnum );
-	CtdlGetRoom(&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);
 	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;
 }
 
@@ -696,6 +703,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;
@@ -709,18 +717,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 < AxAideU) ) {
+	if ( (config.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, "");
@@ -752,7 +760,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);
 }
 
@@ -762,6 +770,7 @@ void cmd_regi(char *argbuf) {
  */
 void cmd_greg(char *argbuf)
 {
+	struct CitContext *CCC = CC;
 	struct ctdluser usbuf;
 	struct vCard *v;
 	char *s;
@@ -771,14 +780,14 @@ 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 < AxAideU) && (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;
@@ -841,7 +850,9 @@ 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);
 	syslog(LOG_DEBUG, "Converted <%s> to <%s>", usbuf->fullname, vname);
 
@@ -867,17 +878,41 @@ void vcard_newuser(struct ctdluser *usbuf) {
 #endif // HAVE_GETPWUID_R
 			snprintf(buf, sizeof buf, "%s@%s", pwd.pw_name, config.c_fqdn);
 			vcard_add_prop(v, "email;internet", buf);
+			need_default_vcard=0;
 		}
 	}
 #endif
 
-	/* Everyone gets an email address based on their display name */
-	snprintf(buf, sizeof buf, "%s@%s", usbuf->fullname, config.c_fqdn);
-	for (i=0; buf[i]; ++i) {
-		if (buf[i] == ' ') buf[i] = '_';
-	}
-	vcard_add_prop(v, "email;internet", buf);
 
+#ifdef HAVE_LDAP
+	/*
+	 * Is this an LDAP session?  If so, copy various LDAP attributes from the directory entry
+	 * into the user's vCard.
+	 */
+	if ((config.c_auth_mode == AUTHMODE_LDAP) || (config.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, config.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);
@@ -892,6 +927,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;
@@ -900,19 +936,19 @@ 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");
+	CM_SetField(msg, eAuthor, usbuf->fullname, strlen(usbuf->fullname));
+	CM_SetField(msg, eOriginalRoom, HKEY(ADDRESS_BOOK_ROOM));
+	CM_SetField(msg, eNodeName, CFG_KEY(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, QP_EADDR);
-	CtdlFreeMessage(msg);
+	CM_Free(msg);
 }
 
 
@@ -931,8 +967,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");
@@ -974,8 +1013,11 @@ void vcard_delete_remove(char *room, long msgnum) {
 	msg = CtdlFetchMessage(msgnum, 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;
@@ -989,7 +1031,7 @@ void vcard_delete_remove(char *room, long msgnum) {
 		if (ptr != NULL) ++ptr;
 	}
 
-EOH:	CtdlFreeMessage(msg);
+EOH:	CM_Free(msg);
 }
 
 
@@ -999,12 +1041,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 ( (!IsEmptyStr(CC->cs_inet_fn)) && (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");
 }
@@ -1015,6 +1059,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];
@@ -1022,13 +1067,13 @@ void cmd_gvea(char *argbuf)
 	if (CtdlAccessCheck(ac_logged_in)) return;
 
 	cprintf("%d valid email addresses:\n", LISTING_FOLLOWS);
-	if (!IsEmptyStr(CC->cs_inet_email)) {
-		cprintf("%s\n", CC->cs_inet_email);
+	if (!IsEmptyStr(CCC->cs_inet_email)) {
+		cprintf("%s\n", CCC->cs_inet_email);
 	}
-	if (!IsEmptyStr(CC->cs_inet_other_emails)) {
-		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);
 		}
 	}
@@ -1094,14 +1139,13 @@ void dvca_callback(long msgnum, void *userdata) {
 
 	msg = CtdlFetchMessage(msgnum, 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);
 }
 
 
@@ -1159,7 +1203,7 @@ void check_get(void) {
 	
 	if (strncasecmp(cmdbuf, "GET ", 4)==0)
 	{
-		struct recptypes *rcpt;
+		recptypes *rcpt;
 		char *argbuf = &cmdbuf[4];
 		
 		extract_token(internet_addr, argbuf, 0, '|', sizeof internet_addr);
@@ -1241,6 +1285,8 @@ void vcard_session_login_hook(void) {
 		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);
 			}
 		}
@@ -1317,8 +1363,8 @@ void strip_addresses_already_have(long msgnum, void *userdata) {
 
 	msg = CtdlFetchMessage(msgnum, 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) {
@@ -1352,7 +1398,7 @@ void store_this_ha(struct addresses_to_be_filed *aptr) {
 	int i;
 
 	/* First remove any addresses we already have in the address book */
-	CtdlUserGoto(aptr->roomname, 0, 0, NULL, 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);
 
@@ -1364,26 +1410,34 @@ 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", 1, 0, 0));
+			CM_SetField(vmsg, eAuthor, HKEY("Citadel"));
+			s = vcard_get_prop(v, "UID", 1, 0, 0);
+			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);
 
 			syslog(LOG_DEBUG, "Adding contact: %s", recipient);
 			CtdlSubmitMsg(vmsg, NULL, aptr->roomname, QP_EADDR);
-			CtdlFreeMessage(vmsg);
+			CM_Free(vmsg);
 		}
 	}
 
@@ -1452,7 +1506,7 @@ CTDL_MODULE_INIT(vcard)
 
 	if (!threading)
 	{
-		CtdlRegisterSessionHook(vcard_session_login_hook, EVT_LOGIN);
+		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);
@@ -1466,7 +1520,7 @@ CTDL_MODULE_INIT(vcard)
 		CtdlRegisterUserHook(vcard_newuser, EVT_NEWUSER);
 		CtdlRegisterUserHook(vcard_purge, EVT_PURGEUSER);
 		CtdlRegisterNetprocHook(vcard_extract_from_network);
-		CtdlRegisterSessionHook(store_harvested_addresses, EVT_TIMER);
+		CtdlRegisterSessionHook(store_harvested_addresses, EVT_TIMER, PRIO_CLEANUP + 470);
 		CtdlRegisterFixedOutputHook("text/x-vcard", vcard_fixed_output);
 		CtdlRegisterFixedOutputHook("text/vcard", vcard_fixed_output);
 
@@ -1492,6 +1546,10 @@ CTDL_MODULE_INIT(vcard)
 			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 */