Fix for bugzilla #364

[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 00411d6d77346df5ca663755976cd12db53aa194..83f22d1fc41c89ddd98f131fd2b27618513df3fc 100644 (file)
--- a/citadel/modules/vcard/serv_vcard.c
+++ b/citadel/modules/vcard/serv_vcard.c
@@ -310,7 +310,7 @@ void ctdl_vcard_to_directory(struct CtdlMessage *msg, int op) {
        (void) CtdlDoDirectoryServiceFunc(ldap_dn, NULL, &objectlist, "ldap", DIRECTORY_SAVE_OBJECT);
        
        (void) CtdlDoDirectoryServiceFunc(NULL, NULL, &objectlist, "ldap", DIRECTORY_FREE_OBJECT);
-       lprintf(CTDL_DEBUG, "Directory Services write operation complete.\n");
+       CtdlLogPrintf(CTDL_DEBUG, "Directory Services write operation complete.\n");
 }
 
 
@@ -327,18 +327,18 @@ void vcard_directory_add_user(char *internet_addr, char *citadel_addr) {
         * probably just the networker or something.
         */
        if (CC->logged_in) {
-               lprintf(CTDL_DEBUG, "Checking for <%s>...\n", internet_addr);
+               CtdlLogPrintf(CTDL_DEBUG, "Checking for <%s>...\n", 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");
+                               CtdlLogPrintf(CTDL_DEBUG, "DOOP!\n");
                                return;
                        }
                }
        }
-       lprintf(CTDL_INFO, "Adding %s (%s) to directory\n",
+       CtdlLogPrintf(CTDL_INFO, "Adding %s (%s) to directory\n",
                        citadel_addr, internet_addr);
        CtdlDirectoryAddUser(internet_addr, citadel_addr);
 }
@@ -465,7 +465,7 @@ void vcard_extract_vcard(char *name, char *filename, char *partnum, char *disp,
        if (  (!strcasecmp(cbtype, "text/x-vcard"))
           || (!strcasecmp(cbtype, "text/vcard")) ) {
 
-               lprintf(CTDL_DEBUG, "Part %s contains a vCard!  Loading...\n", partnum);
+               CtdlLogPrintf(CTDL_DEBUG, "Part %s contains a vCard!  Loading...\n", partnum);
                if (*v != NULL) {
                        vcard_free(*v);
                }
@@ -543,7 +543,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
        }
 
        s = vcard_get_prop(v, "FN", 0, 0, 0);
-       if (s) lprintf(CTDL_DEBUG, "vCard beforesave hook running for <%s>\n", s);
+       if (s) CtdlLogPrintf(CTDL_DEBUG, "vCard beforesave hook running for <%s>\n", s);
 
        if (yes_my_citadel_config) {
                /* Bingo!  The user is uploading a new vCard, so
@@ -714,8 +714,13 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
                        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 (CC->user.axlevel >= 6)
+                               return (0);
+                       
                        set_mm_valid();
 
                        /* ...which also means we need to flag the user */
@@ -978,7 +983,7 @@ void vcard_newuser(struct ctdluser *usbuf) {
        struct vCard *v;
 
        vcard_fn_to_n(vname, usbuf->fullname, sizeof vname);
-       lprintf(CTDL_DEBUG, "Converted <%s> to <%s>\n", usbuf->fullname, vname);
+       CtdlLogPrintf(CTDL_DEBUG, "Converted <%s> to <%s>\n", usbuf->fullname, vname);
 
        /* Create and save the vCard */
        v = vcard_new();
@@ -987,10 +992,11 @@ void vcard_newuser(struct ctdluser *usbuf) {
        vcard_add_prop(v, "n", vname);
        vcard_add_prop(v, "adr", "adr:;;_;_;_;00000;__");
 
+#ifdef HAVE_GETPWUID_R
        /* If using host auth mode, we add an email address based on the login */
        if (config.c_auth_mode == AUTHMODE_HOST) {
                struct passwd pwd;
-               struct passwd **result;
+               struct passwd **result = NULL;
                char pwd_buffer[SIZ];
 
                if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer, result) == 0) {
@@ -998,6 +1004,7 @@ void vcard_newuser(struct ctdluser *usbuf) {
                        vcard_add_prop(v, "email;internet", buf);
                }
        }
+#endif
 
        /* Everyone gets an email address based on their display name */
        snprintf(buf, sizeof buf, "%s@%s", usbuf->fullname, config.c_fqdn);
@@ -1039,7 +1046,7 @@ void vcard_purge(struct ctdluser *usbuf) {
 
        msg->cm_fields['S'] = strdup("CANCEL");
 
-       CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM);
+       CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM, QP_EADDR);
        CtdlFreeMessage(msg);
 }
 
@@ -1278,11 +1285,11 @@ 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");
+               CtdlLogPrintf(CTDL_CRIT, "Client disconnected: ending session.\n");
                CC->kill_me = 1;
                return;
        }
-       lprintf(CTDL_INFO, ": %s\n", cmdbuf);
+       CtdlLogPrintf(CTDL_INFO, ": %s\n", cmdbuf);
        while (strlen(cmdbuf) < 3) strcat(cmdbuf, " ");
 
        if (strcasecmp(cmdbuf, "GET "));
@@ -1300,13 +1307,13 @@ 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);
+                       CtdlLogPrintf(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);
+                       CtdlLogPrintf(CTDL_INFO, "sending 500 REJECT noone here by that name: %s\n", internet_addr);
                }
                if (rcpt != NULL) free_recipients(rcpt);
        }
@@ -1330,7 +1337,7 @@ void vcard_create_room(void)
 
        /* 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");
+               CtdlLogPrintf(CTDL_ERR, "Couldn't get the user CONTACTS room!\n");
                return;
        }
        qr.QRep.expire_mode = EXPIRE_MANUAL;
@@ -1479,8 +1486,8 @@ void store_this_ha(struct addresses_to_be_filed *aptr) {
                        }
                        vcard_free(v);
 
-                       lprintf(CTDL_DEBUG, "Adding contact: %s\n", recipient);
-                       vmsgnum = CtdlSubmitMsg(vmsg, NULL, aptr->roomname);
+                       CtdlLogPrintf(CTDL_DEBUG, "Adding contact: %s\n", recipient);
+                       vmsgnum = CtdlSubmitMsg(vmsg, NULL, aptr->roomname, QP_EADDR);
                        CtdlFreeMessage(vmsg);
                }
        }