Lots of LDAP changes.

[citadel.git] / citadel / modules / vcard / serv_vcard.c

diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c
index 066fc72534780a57216584f45b17e52faf695238..7528db3c78a5a6def73e967a0b64f9c1e7a784d8 100644 (file)
--- a/citadel/modules/vcard/serv_vcard.c
+++ b/citadel/modules/vcard/serv_vcard.c
@@ -156,6 +156,7 @@ void ctdl_vcard_to_directory(struct CtdlMessage *msg, int op) {
        char state[3];
        char zipcode[10];
        char calFBURL[256];
+       char *EUID=NULL;
 
        if (msg == NULL) return;
        if (msg->cm_fields['M'] == NULL) return;
@@ -300,17 +301,21 @@ void ctdl_vcard_to_directory(struct CtdlMessage *msg, int op) {
        /* Add a "cn" (Common Name) attribute based on the user's screen name,
         * but only there was no 'fn' (full name) property in the vCard 
         */
-       if (!have_cn) {
+       if (!have_cn)
                (void) CtdlDoDirectoryServiceFunc("cn", msg->cm_fields['A'], &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
-       }
 
        /* Add a "calFBURL" attribute if a calendar free/busy URL exists */
        if (!IsEmptyStr(calFBURL)) {
                (void) CtdlDoDirectoryServiceFunc("calFBURL", calFBURL, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
        }
        
-       (void) CtdlDoDirectoryServiceFunc(msg->cm_fields['A'], msg->cm_fields['N'], &objectlist, "ldap", DIRECTORY_SAVE_OBJECT);
-
+       // Add this messages EUID as the primary key for this entry.
+       EUID=msg->cm_fields['E'];
+       (void) CtdlDoDirectoryServiceFunc("euid", EUID, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
+       
+       
+       (void) CtdlDoDirectoryServiceFunc(EUID, msg->cm_fields['N'], &objectlist, "ldap", DIRECTORY_SAVE_OBJECT);
+       
        (void) CtdlDoDirectoryServiceFunc(NULL, NULL, &objectlist, "ldap", DIRECTORY_FREE_OBJECT);
        lprintf(CTDL_DEBUG, "LDAP write operation complete.\n");
 }