#include <sys/wait.h>
#include <string.h>
#include <limits.h>
+#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
#include "citserver.h"
#include "database.h"
#include "msgbase.h"
#include "internet_addressing.h"
-#include "tools.h"
-#include "mime_parser.h"
-#include "vcard.h"
#include "serv_vcard.h"
#include "ctdl_module.h"
void (*callback)(char *, char *) ) {
struct vCard *v;
char *s;
+ char *k;
char *addr;
char citadel_address[SIZ];
int instance = 0;
* 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 (!IsEmptyStr(addr)) {
*/
-void ctdl_vcard_to_ldap(struct CtdlMessage *msg, int op) {
+void ctdl_vcard_to_directory(struct CtdlMessage *msg, int op) {
struct vCard *v = NULL;
int i;
- int num_emails = 0;
- int num_phones = 0;
int have_addr = 0;
int have_cn = 0;
char state[3];
char zipcode[10];
char calFBURL[256];
+ char ldap_dn[SIZ];
if (msg == NULL) return;
if (msg->cm_fields['M'] == NULL) return;
msg->cm_fields['N']
);
+ sprintf(ldap_dn, "euid=%s,ou=%s", msg->cm_fields['E'], msg->cm_fields['N']);
+
/* Are we just deleting? If so, it's simple... */
if (op == V2L_DELETE) {
- (void) CtdlDoDirectoryServiceFunc (msg->cm_fields['A'], msg->cm_fields['N'], NULL, "ldap", DIRECTORY_USER_DEL);
+ (void) CtdlDoDirectoryServiceFunc (ldap_dn, NULL, NULL, "ldap", DIRECTORY_USER_DEL);
return;
}
extract_token(state, v->prop[i].value, 4, ';', sizeof state);
extract_token(zipcode, v->prop[i].value, 5, ';', sizeof zipcode);
+ // ldap requires these fields to be something
+ if (IsEmptyStr(street)) strcpy(street, "_");
+ if (IsEmptyStr(zipcode)) strcpy(zipcode, "_");
+ if (IsEmptyStr(city)) strcpy(city, "_");
+ if (IsEmptyStr(state)) strcpy(state, "_");
+
(void) CtdlDoDirectoryServiceFunc("street", street, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
(void) CtdlDoDirectoryServiceFunc("l", city, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
(void) CtdlDoDirectoryServiceFunc("st", state, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
}
}
+ if ( (!strcasecmp(v->prop[i].name, "tel;home"))
+ || (!strcasecmp(v->prop[i].name, "tel;type=home")) )
+ (void) CtdlDoDirectoryServiceFunc("homePhone", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
+ else
+ if ( (!strcasecmp(v->prop[i].name, "tel;fax"))
+ || (!strcasecmp(v->prop[i].name, "tel;type=fax")) )
+ (void) CtdlDoDirectoryServiceFunc("facsimileTelephoneNumber", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
+ else
+ if ( (!strcasecmp(v->prop[i].name, "tel;cell"))
+ || (!strcasecmp(v->prop[i].name, "tel;type=cell")) )
+ (void) CtdlDoDirectoryServiceFunc("mobile", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
+ else
if ( (!strcasecmp(v->prop[i].name, "tel"))
||(!strncasecmp(v->prop[i].name, "tel;", 4)) ) {
- ++num_phones;
- /* The first 'tel' property creates the 'telephoneNumber' attribute */
- if (num_phones == 1) {
- (void) CtdlDoDirectoryServiceFunc("telephoneNumber", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
- }
- /* Subsequent 'tel' properties *add to* the 'telephoneNumber' attribute */
- else {
- (void) CtdlDoDirectoryServiceFunc("telephoneNumber", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
- }
+ (void) CtdlDoDirectoryServiceFunc("telephoneNumber", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
}
if ( (!strcasecmp(v->prop[i].name, "email"))
||(!strcasecmp(v->prop[i].name, "email;internet")) ) {
-
- ++num_emails;
- lprintf(CTDL_DEBUG, "email addr %d\n", num_emails);
-
- /* The first email address creates the 'mail' attribute */
- if (num_emails == 1) {
- (void) CtdlDoDirectoryServiceFunc("mail", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
- }
- /* The second and subsequent email address creates the 'alias' attribute */
- else if (num_emails >= 2) {
- (void) CtdlDoDirectoryServiceFunc("alias", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
- }
+ (void) CtdlDoDirectoryServiceFunc("mail", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
}
/* Calendar free/busy URL (take the first one we find, but if a subsequent
/* 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.
+ (void) CtdlDoDirectoryServiceFunc("euid", msg->cm_fields['E'], &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
+
+
+ (void) CtdlDoDirectoryServiceFunc(ldap_dn, NULL, &objectlist, "ldap", DIRECTORY_SAVE_OBJECT);
+
(void) CtdlDoDirectoryServiceFunc(NULL, NULL, &objectlist, "ldap", DIRECTORY_FREE_OBJECT);
- lprintf(CTDL_DEBUG, "LDAP write operation complete.\n");
+ CtdlLogPrintf(CTDL_DEBUG, "Directory Services write operation complete.\n");
}
* 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);
}
vcard_extract_internet_addresses(msg, vcard_directory_add_user);
}
-#ifdef HAVE_LDAP
- if (!IsEmptyStr(config.c_ldap_base_dn))
- ctdl_vcard_to_ldap(msg, V2L_WRITE);
-#endif
+ ctdl_vcard_to_directory(msg, V2L_WRITE);
CtdlFreeMessage(msg);
}
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 *s, *k, *addr;
int instance = 0;
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 (!IsEmptyStr(addr)) {
- 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)) {
+ 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);
+ }
}
}
}
+ free(addr);
}
- free(addr);
+ ++instance;
}
}
{
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) {
*/
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);
+ CtdlLogPrintf(CTDL_DEBUG, "Part %s contains a vCard! Loading...\n", partnum);
if (*v != NULL) {
vcard_free(*v);
}
return(1);
}
- s = vcard_get_prop(v, "FN", 0, 0, 0);
- if (s) lprintf(CTDL_DEBUG, "vCard beforesave hook running for <%s>\n", s);
+ s = vcard_get_prop(v, "fn", 1, 0, 0);
+ 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
}
/* If the vCard has no UID, then give it one. */
- s = vcard_get_prop(v, "UID", 0, 0, 0);
+ s = vcard_get_prop(v, "UID", 1, 0, 0);
if (s == NULL) {
generate_uuid(buf);
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 (msg->cm_fields['E'] != NULL)
+ {
+ free(msg->cm_fields['E']);
+ msg->cm_fields['E'] = NULL;
+ }
+ s = vcard_get_prop(v, "UID", 1, 0, 0);
if (s != NULL) {
msg->cm_fields['E'] = strdup(s);
if (msg->cm_fields['U'] == NULL) {
/*
* 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) {
int linelen;
long I;
struct vCard *v;
+ int is_UserConf=0;
+ int is_MY_UserConf=0;
+ int is_GAB=0;
+ char roomname[ROOMNAMELEN];
+ if (msg->cm_format_type != 4) return(0);
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);
+ /* We're interested in user config rooms only. */
+
+ if ( (strlen(CC->room.QRname) >= 12) && (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) {
+ is_UserConf = 1; /* It's someone's config room */
+ }
+ MailboxName(roomname, sizeof roomname, &CC->user, USERCONFIGROOM);
+ if (!strcasecmp(CC->room.QRname, roomname)) {
+ is_UserConf = 1;
+ is_MY_UserConf = 1; /* It's MY config room */
+ }
+ if (!strcasecmp(CC->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 (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,
+ 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, 1);
- extract_friendly_name(CC->cs_inet_fn, sizeof CC->cs_inet_fn, v);
- vcard_free(v);
+ extract_friendly_name(CC->cs_inet_fn, sizeof CC->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 (CC->user.axlevel >= 6) {
+ lgetuser(&CC->user, CC->curr_user);
+ CC->user.flags |= US_REGIS;
+ lputuser(&CC->user);
+ return (0);
+ }
+
set_mm_valid();
/* ...which also means we need to flag the user */
* 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) return;
/* This handy API function does all the work for us.
* NOTE: normally we would want to set that last argument to 1, to
* 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);
}
}
}
}
- 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;
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);
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);
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();
if (v == NULL) return;
- sprintf(buf, "%s@%s", usbuf->fullname, config.c_fqdn);
- for (i=0; buf[i]; ++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;__");
+
+#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;
+ 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;
+ CtdlLogPrintf(CTDL_DEBUG, "Searching for uid %d\n", 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);
+ 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);
+ 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);
}
msg->cm_fields['S'] = strdup("CANCEL");
- CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM);
+ CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM, QP_EADDR);
CtdlFreeMessage(msg);
}
|| (!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
+ ctdl_vcard_to_directory(msg, V2L_DELETE);
}
ptr = strchr((char *)ptr, '\n');
if (ptr != NULL) ++ptr;
*/
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];
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 "));
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')||
{
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);
}
/* 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;
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));
+ vmsg->cm_fields['E'] = strdup(vcard_get_prop(v, "UID", 1, 0, 0));
ser = vcard_serialize(v);
if (ser != NULL) {
vmsg->cm_fields['M'] = malloc(strlen(ser) + 1024);
}
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);
}
}
char filename[256];
FILE *fp;
- 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);
+ 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);
+
+ /* 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);
- /* 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);
+ chown(filename, CTDLUID, (-1));
+ }
- /* for postfix tcpdict */
- CtdlRegisterServiceHook(config.c_pftcpdict_port, /* Postfix */
- NULL,
- check_get_greeting,
- check_get,
- NULL,
- CitadelServiceDICT_TCP);
+ /* for postfix tcpdict */
+ CtdlRegisterServiceHook(config.c_pftcpdict_port, /* Postfix */
+ NULL,
+ check_get_greeting,
+ check_get,
+ NULL,
+ CitadelServiceDICT_TCP);
+ }
/* return our Subversion id for the Log */
return "$Id$";
projects / citadel.git / blobdiff