#include <limits.h>
#include "citadel.h"
#include "server.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
#include "sysdep_decls.h"
#include "citserver.h"
#include "support.h"
};
char *inetcfg = NULL;
-
+struct spamstrings_t *spamstrings = NULL;
/*
char buf[SIZ];
char host[SIZ], type[SIZ];
+ if (fqdn == NULL) return(hostalias_nomatch);
+ if (strlen(fqdn) == 0) return(hostalias_nomatch);
if (!strcasecmp(fqdn, config.c_fqdn)) return(hostalias_localhost);
if (!strcasecmp(fqdn, config.c_nodename)) return(hostalias_localhost);
if (inetcfg == NULL) return(hostalias_nomatch);
*
* FIXME ... this needs to be updated to handle aliases.
*/
-int fuzzy_match(struct usersupp *us, char *matchstring) {
+int fuzzy_match(struct ctdluser *us, char *matchstring) {
int a;
if ( (!strncasecmp(matchstring, "cit", 3))
* Split an RFC822-style address into userid, host, and full name
*
*/
-void process_rfc822_addr(char *rfc822, char *user, char *node, char *name)
+void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
{
int a;
-/*
- * Back end for convert_internet_address()
- * (Compares an internet name [buffer1] and stores in [buffer2] if found)
- */
-void try_name(struct usersupp *us, void *data) {
- struct passwd *pw;
- struct trynamebuf *tnb;
- tnb = (struct trynamebuf *)data;
-
- if (!strncasecmp(tnb->buffer1, "cit", 3))
- if (atol(&tnb->buffer1[3]) == us->usernum)
- strcpy(tnb->buffer2, us->fullname);
-
- if (!collapsed_strcmp(tnb->buffer1, us->fullname))
- strcpy(tnb->buffer2, us->fullname);
-
- if (us->uid != BBSUID) {
- pw = getpwuid(us->uid);
- if (pw != NULL) {
- if (!strcasecmp(tnb->buffer1, pw->pw_name)) {
- strcpy(tnb->buffer2, us->fullname);
- }
- }
- }
-}
-
-
-/*
- * Convert an Internet email address to a Citadel user/host combination
- */
-int convert_internet_address(char *destuser, char *desthost, char *source)
-{
- char user[SIZ];
- char node[SIZ];
- char name[SIZ];
- struct quickroom qrbuf;
- int i;
- int hostalias;
- struct trynamebuf tnb;
- char buf[SIZ];
- int passes = 0;
- char sourcealias[1024];
-
- safestrncpy(sourcealias, source, sizeof(sourcealias) );
- alias(sourcealias);
-
-REALIAS:
- /* Split it up */
- process_rfc822_addr(sourcealias, user, node, name);
- lprintf(9, "process_rfc822_addr() converted to <%s@%s> (%s)\n",
- user, node, name);
-
- /* Map the FQDN to a Citadel node name
- */
- hostalias = CtdlHostAlias(node);
- switch(hostalias) {
- case hostalias_localhost:
- strcpy(node, config.c_nodename);
- break;
-
- case hostalias_gatewaydomain:
- extract_token(buf, node, 0, '.');
- safestrncpy(node, buf, sizeof buf);
- }
-
- /* Now try to resolve the name
- * FIXME ... do the multiple-addresses thing
- */
- if (!strcasecmp(node, config.c_nodename)) {
-
-
- /* First, see if we hit an alias. Don't do this more than
- * a few times, in case we accidentally hit an alias loop
- */
- strcpy(sourcealias, user);
- alias(user);
- if ( (strcasecmp(user, sourcealias)) && (++passes < 3) )
- goto REALIAS;
-
- /* Try all local rooms */
- if (!strncasecmp(user, "room_", 5)) {
- strcpy(name, &user[5]);
- for (i=0; i<strlen(name); ++i)
- if (name[i]=='_') name[i]=' ';
- if (getroom(&qrbuf, name) == 0) {
- strcpy(destuser, qrbuf.QRname);
- strcpy(desthost, config.c_nodename);
- return rfc822_room_delivery;
- }
- }
-
- /* Try all local users */
- strcpy(destuser, user);
- strcpy(desthost, config.c_nodename);
- strcpy(tnb.buffer1, user);
- strcpy(tnb.buffer2, "");
- ForEachUser(try_name, &tnb);
- if (strlen(tnb.buffer2) == 0) return(rfc822_no_such_user);
- strcpy(destuser, tnb.buffer2);
- return(rfc822_address_locally_validated);
- }
-
- strcpy(destuser, user);
- strcpy(desthost, node);
- if (hostalias == hostalias_gatewaydomain)
- return(rfc822_address_on_citadel_network);
- return(rfc822_address_nonlocal);
-}
-
-
-
-
/*
* convert_field() is a helper function for convert_internet_message().
* Given start/end positions for an rfc822 field, it converts it to a Citadel
end = pos;
}
- /* done with headers? */
+ /* done with headers? (commented out; see below)
if ( ((rfc822[pos]=='\n')
||(rfc822[pos]=='\r') )
&& ( (rfc822[pos+1]=='\n')
end = pos;
done = 1;
}
+ */
+
+ /* done with headers? (try this way instead) */
+ if ( (rfc822[pos]=='\n')
+ && ( (rfc822[pos+1]=='\n')
+ ||(rfc822[pos+1]=='\r')) ) {
+ end = pos;
+ done = 1;
+ }
if (pos >= (msglen-1) ) {
end = pos;
* Initialize the directory database (erasing anything already there)
*/
void CtdlDirectoryInit(void) {
- /* FIXME ... write this */
+ cdb_trunc(CDB_DIRECTORY);
}
/*
- * Delete an Internet e-mail address from the directory
+ * Delete an Internet e-mail address from the directory.
+ *
+ * (NOTE: we don't actually use or need the citadel_addr variable; it's merely
+ * here because the callback API expects to be able to send it.)
*/
-void CtdlDirectoryDelUser(char *internet_addr) {
+void CtdlDirectoryDelUser(char *internet_addr, char *citadel_addr) {
char key[SIZ];
directory_key(key, internet_addr);
struct cdbdata *cdbrec;
char key[SIZ];
- lprintf(9, "CtdlDirectoryLookup(%s)\n", internet_addr);
+ /* Dump it in there unchanged, just for kicks */
+ strcpy(target, internet_addr);
+
+ /* Only do lookups for addresses with hostnames in them */
+ if (num_tokens(internet_addr, '@') != 2) return(-1);
+ /* Only do lookups for domains in the directory */
if (IsDirectory(internet_addr) == 0) return(-1);
directory_key(key, internet_addr);
if (cdbrec != NULL) {
safestrncpy(target, cdbrec->ptr, SIZ);
cdb_free(cdbrec);
- lprintf(9, "Looked up as <%s>\n", target);
return(0);
}
- lprintf(9, "Lookup failed\n");
return(-1);
}
projects / citadel.git / blobdiff