#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;
/*
* 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;
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;
struct cdbdata *cdbrec;
char key[SIZ];
- lprintf(9, "CtdlDirectoryLookup(%s)\n", internet_addr);
-
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);
}