X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fvcard%2Fserv_vcard.c;h=f3624bdc451e8891b0e02ccf430ca2dd64f14196;hp=39820f7762dc7a821609c060995ec6ecb99c77c0;hb=1cf98031e3530393ec5fb753567bf496c6277ab3;hpb=4db4fc48793f3680c5defd28ea32c97044a2b569 diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c index 39820f776..f3624bdc4 100644 --- a/citadel/modules/vcard/serv_vcard.c +++ b/citadel/modules/vcard/serv_vcard.c @@ -2,7 +2,7 @@ * A server-side module for Citadel which supports address book information * using the standard vCard format. * - * Copyright (c) 1999-2012 by the citadel.org team + * Copyright (c) 1999-2017 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. @@ -73,10 +73,12 @@ * 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); } @@ -127,103 +129,10 @@ void vcard_extract_internet_addresses(struct CtdlMessage *msg, int (*callback)(c vcard_free(v); } -///TODO: gettext! -#define _(a) a -/* - * Callback for vcard_add_to_directory() - * (Lotsa ugly nested callbacks. Oh well.) - */ -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 (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. - */ - 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; - } - } - } - 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; - } -} - - -/* - * Back end function for cmd_igab() - */ -void vcard_add_to_directory(long msgnum, void *data) { - struct CtdlMessage *msg; - - msg = CtdlFetchMessage(msgnum, 1); - if (msg != NULL) { - vcard_extract_internet_addresses(msg, vcard_directory_add_user); - } - - CM_Free(msg); -} - - -/* - * Initialize Global Adress Book - */ -void cmd_igab(char *argbuf) { - char hold_rm[ROOMNAMELEN]; - - if (CtdlAccessCheck(ac_aide)) return; - - strcpy(hold_rm, CC->room.QRname); /* save current room */ - - 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; - } - - /* Empty the existing database first. - */ - CtdlDirectoryInit(); - - /* We want *all* vCards in this room */ - 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); - - CtdlGetRoom(&CC->room, hold_rm); /* return to saved room */ - cprintf("%d Directory has been rebuilt.\n", CIT_OK); -} +///TODO: gettext! +#define _(a) a /* @@ -314,7 +223,7 @@ void vcard_extract_vcard(char *name, char *filename, char *partnum, char *disp, if ( (!strcasecmp(cbtype, "text/x-vcard")) || (!strcasecmp(cbtype, "text/vcard")) ) { - syslog(LOG_DEBUG, "Part %s contains a vCard! Loading...", partnum); + syslog(LOG_DEBUG, "vcard: part %s contains a vCard! Loading...", partnum); if (*v != NULL) { vcard_free(*v); } @@ -385,7 +294,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg, recptypes *recp) { /* If users cannot create their own accounts, they cannot re-register either. */ if ( (yes_my_citadel_config) && - (config.c_disable_newu) && + (CtdlGetConfigInt("c_disable_newu")) && (CCC->user.axlevel < AxAideU) && (CCC->vcard_updated_by_ldap==0) ) { @@ -427,13 +336,15 @@ int vcard_upload_beforesave(struct CtdlMessage *msg, recptypes *recp) { 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. */ - CM_SetField(msg, eAuthor, usbuf.fullname, strlen(usbuf.fullname)); + if (!IsEmptyStr(usbuf.fullname)) { + CM_SetField(msg, eAuthor, usbuf.fullname, strlen(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; buf[i]; ++i) { if (buf[i] == ' ') buf[i] = '_'; @@ -461,7 +372,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg, recptypes *recp) { CM_FlushField(msg, eExclusiveID); s = vcard_get_prop(v, "UID", 1, 0, 0); - if (s != NULL) { + if (!IsEmptyStr(s)) { CM_SetField(msg, eExclusiveID, s, strlen(s)); if (CM_IsEmpty(msg, eMsgSubject)) { CM_CopyField(msg, eMsgSubject, eExclusiveID); @@ -475,13 +386,13 @@ int vcard_upload_beforesave(struct CtdlMessage *msg, recptypes *recp) { if (s == NULL) { s = vcard_get_prop(v, "N", 1, 0, 0); } - if (s != NULL) { + 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) { + if (!IsEmptyStr(ser)) { StrBuf *buf; long serlen; @@ -524,7 +435,9 @@ int vcard_upload_aftersave(struct CtdlMessage *msg, recptypes *recp) { /* We're interested in user config rooms only. */ - if ( (strlen(CCC->room.QRname) >= 12) && (!strcasecmp(&CCC->room.QRname[11], USERCONFIGROOM)) ) { + 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); @@ -564,12 +477,9 @@ int vcard_upload_aftersave(struct CtdlMessage *msg, recptypes *recp) { I = atol(msg->cm_fields[eVltMsgNum]); if (I <= 0L) return(0); - /* Store our Internet return address in memory */ + /* Store our friendly/display name in memory */ 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(CCC->cs_inet_fn, sizeof CCC->cs_inet_fn, v); vcard_free(v); } @@ -580,9 +490,6 @@ int vcard_upload_aftersave(struct CtdlMessage *msg, recptypes *recp) { 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 * But if the user was an Aide or was edited by an Aide then we can @@ -653,7 +560,7 @@ struct vCard *vcard_get_user(struct ctdluser *u) { 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[eMesageText]); @@ -675,7 +582,7 @@ void vcard_write_user(struct ctdluser *u, struct vCard *v) { if (ser == NULL) { ser = strdup("begin:vcard\r\nend:vcard\r\n"); } - if (!ser) return; + 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 @@ -723,7 +630,7 @@ void cmd_regi(char *argbuf) { } /* If users cannot create their own accounts, they cannot re-register either. */ - if ( (config.c_disable_newu) && (CCC->user.axlevel < AxAideU) ) { + if ( (CtdlGetConfigInt("c_disable_newu")) && (CCC->user.axlevel < AxAideU) ) { cprintf("%d Self-service registration is not allowed here.\n", ERROR + HIGHER_ACCESS_REQUIRED); } @@ -788,8 +695,7 @@ void cmd_greg(char *argbuf) if (!strcasecmp(who,"_SELF_")) strcpy(who,CCC->curr_user); if ((CCC->user.axlevel < AxAideU) && (strcasecmp(who,CCC->curr_user))) { - cprintf("%d Higher access required.\n", - ERROR + HIGHER_ACCESS_REQUIRED); + cprintf("%d Higher access required.\n", ERROR + HIGHER_ACCESS_REQUIRED); return; } @@ -804,11 +710,9 @@ void cmd_greg(char *argbuf) cprintf("%ld\n", usbuf.usernum); cprintf("%s\n", usbuf.password); s = vcard_get_prop(v, "n", 1, 0, 0); - cprintf("%s\n", s ? s : " "); /* name */ - + cprintf("%s\n", s ? s : " "); /* name */ s = vcard_get_prop(v, "adr", 1, 0, 0); - snprintf(adr, sizeof adr, "%s", s ? s : " ");/* address... */ - + snprintf(adr, sizeof adr, "%s", s ? s : " "); /* address */ extract_token(buf, adr, 2, ';', sizeof buf); cprintf("%s\n", buf); /* street */ extract_token(buf, adr, 3, ';', sizeof buf); @@ -854,7 +758,7 @@ void vcard_newuser(struct ctdluser *usbuf) { need_default_vcard =1; vcard_fn_to_n(vname, usbuf->fullname, sizeof vname); - syslog(LOG_DEBUG, "Converted <%s> to <%s>", usbuf->fullname, vname); + syslog(LOG_DEBUG, "vcard: converted <%s> to <%s>", usbuf->fullname, vname); /* Create and save the vCard */ v = vcard_new(); @@ -865,7 +769,7 @@ void vcard_newuser(struct ctdluser *usbuf) { #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) { + if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_HOST) { struct passwd pwd; char pwd_buffer[SIZ]; @@ -873,12 +777,12 @@ void vcard_newuser(struct ctdluser *usbuf) { 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); + syslog(LOG_DEBUG, "vcard: 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, config.c_fqdn); + snprintf(buf, sizeof buf, "%s@%s", pwd.pw_name, CtdlGetConfigStr("c_fqdn")); vcard_add_prop(v, "email;internet", buf); - need_default_vcard=0; + need_default_vcard = 0; } } #endif @@ -889,31 +793,34 @@ void vcard_newuser(struct ctdluser *usbuf) { * 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); + 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]; + +syslog(LOG_DEBUG, "\033[31m FIXME BORK BORK BORK try lookup by uid , or maybe dn?\033[0m"); + + + found_user = CtdlTryUserLDAP(usbuf->fullname, ldap_dn, sizeof ldap_dn, ldap_cn, sizeof ldap_cn, &usbuf->uid); + 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, "vcard: 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); - } - + /* 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); } @@ -936,17 +843,16 @@ void vcard_purge(struct ctdluser *usbuf) { msg->cm_magic = CTDLMESSAGE_MAGIC; msg->cm_anon_type = MES_NORMAL; msg->cm_format_type = 0; - CM_SetField(msg, eAuthor, usbuf->fullname, strlen(usbuf->fullname)); + 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, CFG_KEY(c_nodename)); + CM_SetField(msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename"))); CM_SetField(msg, eMesageText, HKEY("Purge this vCard\n")); - len = snprintf(buf, sizeof buf, VCARD_EXT_FORMAT, - msg->cm_fields[eAuthor], NODENAME); + len = snprintf(buf, sizeof buf, VCARD_EXT_FORMAT, msg->cm_fields[eAuthor], NODENAME); CM_SetField(msg, eExclusiveID, buf, len); - CM_SetField(msg, eSpecialField, HKEY("CANCEL")); - CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM, QP_EADDR); CM_Free(msg); } @@ -1010,7 +916,7 @@ void vcard_delete_remove(char *room, long msgnum) { return; } - msg = CtdlFetchMessage(msgnum, 1); + msg = CtdlFetchMessage(msgnum, 1, 1); if (msg == NULL) return; if (CM_IsEmpty(msg, eMesageText)) @@ -1056,6 +962,7 @@ void cmd_gvsn(char *argbuf) /* * Get Valid Email Addresses + * FIXME this doesn't belong in serv_vcard.c anymore , maybe move it to internet_addressing.c */ void cmd_gvea(char *argbuf) { @@ -1081,8 +988,6 @@ void cmd_gvea(char *argbuf) } - - /* * Callback function for cmd_dvca() that hunts for vCard content types * and outputs any email addresses found within. @@ -1137,7 +1042,7 @@ 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(CM_RANGE(msg, eMesageText), *dvca_mime_callback, /* callback function */ @@ -1182,6 +1087,7 @@ void cmd_qdir(char *argbuf) { cprintf("%d %s\n", CIT_OK, citadel_addr); } + /* * Query Directory, in fact an alias to match postfix tcp auth. */ @@ -1193,7 +1099,7 @@ void check_get(void) { time(&CC->lastcmd); memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */ if (client_getln(cmdbuf, sizeof cmdbuf) < 1) { - syslog(LOG_CRIT, "vcard client disconnected: ending session."); + syslog(LOG_ERR, "vcard: client disconnected: ending session."); CC->kill_me = KILLME_CLIENT_DISCONNECTED; return; } @@ -1216,20 +1122,20 @@ void check_get(void) { { cprintf("200 OK %s\n", internet_addr); - syslog(LOG_INFO, "sending 200 OK for the room %s", rcpt->display_recp); + syslog(LOG_INFO, "vcard: sending 200 OK for the room %s", rcpt->display_recp); } else { cprintf("500 REJECT noone here by that name.\n"); - syslog(LOG_INFO, "sending 500 REJECT no one here by that name: %s", internet_addr); + syslog(LOG_INFO, "vcard: sending 500 REJECT no one here by that name: %s", internet_addr); } if (rcpt != NULL) free_recipients(rcpt); } else { cprintf("500 REJECT invalid Query.\n"); - syslog(LOG_INFO, "sending 500 REJECT invalid query: %s", internet_addr); + syslog(LOG_INFO, "vcard: sending 500 REJECT invalid query: %s", internet_addr); } } @@ -1251,7 +1157,7 @@ void vcard_CtdlCreateRoom(void) /* Set expiration policy to manual; otherwise objects will be lost! */ if (CtdlGetRoomLock(&qr, USERCONTACTSROOM)) { - syslog(LOG_ERR, "Couldn't get the user CONTACTS room!"); + syslog(LOG_ERR, "vcard: couldn't get the user CONTACTS room!"); return; } qr.QRep.expire_mode = EXPIRE_MANUAL; @@ -1281,12 +1187,12 @@ void vcard_session_login_hook(void) { * 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)) { + 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"); + syslog(LOG_DEBUG, "vcard: LDAP Detected vcard change"); vcard_write_user(&CCC->user, v); } } @@ -1294,15 +1200,11 @@ void vcard_session_login_hook(void) { #endif /* - * Extract from the user's vCard, any Internet email addresses and the user's real name. + * Extract the user's friendly/screen 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); } @@ -1361,7 +1263,7 @@ 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[eMesageText]); CM_Free(msg); @@ -1418,7 +1320,9 @@ void store_this_ha(struct addresses_to_be_filed *aptr) { vmsg->cm_format_type = FMT_RFC822; CM_SetField(vmsg, eAuthor, HKEY("Citadel")); s = vcard_get_prop(v, "UID", 1, 0, 0); - CM_SetField(vmsg, eExclusiveID, s, strlen(s)); + if (!IsEmptyStr(s)) { + CM_SetField(vmsg, eExclusiveID, s, strlen(s)); + } ser = vcard_serialize(v); if (ser != NULL) { StrBuf *buf; @@ -1435,7 +1339,7 @@ void store_this_ha(struct addresses_to_be_filed *aptr) { } vcard_free(v); - syslog(LOG_DEBUG, "Adding contact: %s", recipient); + syslog(LOG_DEBUG, "vcard: adding contact: %s", recipient); CtdlSubmitMsg(vmsg, NULL, aptr->roomname, QP_EADDR); CM_Free(vmsg); } @@ -1500,9 +1404,9 @@ const char *CitadelServiceDICT_TCP="DICT_TCP"; CTDL_MODULE_INIT(vcard) { struct ctdlroom qr; - char filename[256]; - FILE *fp; - int rv = 0; + //char filename[256]; + //FILE *fp; + //int rv = 0; if (!threading) { @@ -1512,7 +1416,6 @@ CTDL_MODULE_INIT(vcard) 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"); @@ -1524,7 +1427,7 @@ CTDL_MODULE_INIT(vcard) CtdlRegisterFixedOutputHook("text/x-vcard", vcard_fixed_output); CtdlRegisterFixedOutputHook("text/vcard", vcard_fixed_output); - /* Create the Global ADdress Book room if necessary */ + /* 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! */ @@ -1538,22 +1441,30 @@ CTDL_MODULE_INIT(vcard) * 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. + * + * FIXME this no longer works + * */ - 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)); + //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_ERR, "vcard: failed to adjust ownership of %s: %m", filename); + //} + //rv = chmod(filename, 0600); + //if (rv == -1) { + //syslog(LOG_ERR, "vcard: failed to adjust ownership of %s: %m", filename); + //} + //} + //else { + //syslog(LOG_ERR, "vcard: cannot create %s: %m", filename); + //} } /* for postfix tcpdict */ - CtdlRegisterServiceHook(config.c_pftcpdict_port, /* Postfix */ + CtdlRegisterServiceHook(CtdlGetConfigInt("c_pftcpdict_port"), /* Postfix */ NULL, check_get_greeting, check_get,