37e7a819d5
- remove 6 out of the 10 flavors maze, only keep the ones that make sense (ie clamav, ldap, domainscale & largescale) - build pgsql & mysql drivers as subpackages, as $DEITY intended - @pkgpath & PFRAG.[flavor]-main tweaks from sthen@ (thanks!) - remove init_pwent_cache() patch until i can make some sense of it - remove painful strlcpy patches - add patches to fix pgsql support with PSQL > 9.1 from http://sourceforge.net/p/dspam/bug-tracker/112/ & http://sourceforge.net/p/dspam/bug-tracker/141 - add an rc script running dspam --daemon as _dspam - patch default dspam.conf to trust user _dspam (pointed out by jca@; thanks!) and to use port 2424 by default. Taken from debian. Discussed at length with todd@ (MAINTAINER), been running on amd64 with pgsql &| sqlite backend since a while, also tested on sqlite/ppc. Some tweaks might still be needed (a README ? Fix some weird crashers ?), but at least it's better than what we had for the past years.
67 lines
2.0 KiB
Plaintext
67 lines
2.0 KiB
Plaintext
$OpenBSD: patch-src_daemon_c,v 1.5 2013/09/14 17:12:12 landry Exp $
|
|
--- src/daemon.c.orig Wed Apr 11 20:48:33 2012
|
|
+++ src/daemon.c Sun Sep 8 22:15:19 2013
|
|
@@ -97,7 +97,7 @@ int daemon_listen(DRIVER_CTX *DTX) {
|
|
int domain = 0; /* listening on domain socket? */
|
|
int listener; /* listener fd */
|
|
int i;
|
|
- int port = 24, queue = 32; /* default port and queue size */
|
|
+ int port = 2424, queue = 32; /* default port and queue size */
|
|
|
|
signal(SIGPIPE, SIG_IGN);
|
|
signal(SIGINT, process_signal);
|
|
@@ -561,7 +561,7 @@ void *process_connection(void *ptr) {
|
|
|
|
while(ATX->users->items == 0 || invalid) {
|
|
free(cmdline);
|
|
- cmdline = daemon_getline(TTX, 300);
|
|
+ cmdline = daemon_getline(TTX, 900);
|
|
|
|
while(cmdline &&
|
|
(!strncasecmp(cmdline, "RCPT TO:", 8) ||
|
|
@@ -620,7 +620,7 @@ void *process_connection(void *ptr) {
|
|
|
|
GETCMD:
|
|
free(cmdline);
|
|
- cmdline = daemon_getline(TTX, 300);
|
|
+ cmdline = daemon_getline(TTX, 900);
|
|
}
|
|
|
|
if (cmdline == NULL)
|
|
@@ -900,7 +900,7 @@ buffer * read_sock(THREAD_CTX *TTX, AGENT_CTX *ATX) {
|
|
body = 1;
|
|
}
|
|
|
|
- while ((buf = daemon_getline(TTX, 300))!=NULL) {
|
|
+ while ((buf = daemon_getline(TTX, 900))!=NULL) {
|
|
chomp(buf);
|
|
|
|
if (!strcmp(buf, ".")) {
|
|
@@ -992,7 +992,7 @@ char *daemon_expect(THREAD_CTX *TTX, const char *comma
|
|
char buf[128];
|
|
char *cmd;
|
|
|
|
- cmd = daemon_getline(TTX, 300);
|
|
+ cmd = daemon_getline(TTX, 900);
|
|
if (cmd == NULL)
|
|
return NULL;
|
|
|
|
@@ -1007,7 +1007,7 @@ char *daemon_expect(THREAD_CTX *TTX, const char *comma
|
|
return NULL;
|
|
free(cmd);
|
|
if (!strncasecmp(command, "LHLO", 4)) {
|
|
- cmd = daemon_getline(TTX, 300);
|
|
+ cmd = daemon_getline(TTX, 900);
|
|
if (cmd == NULL)
|
|
return NULL;
|
|
} else {
|
|
@@ -1018,7 +1018,7 @@ char *daemon_expect(THREAD_CTX *TTX, const char *comma
|
|
if (send_socket(TTX, buf)<=0)
|
|
return NULL;
|
|
free(cmd);
|
|
- cmd = daemon_getline(TTX, 300);
|
|
+ cmd = daemon_getline(TTX, 900);
|
|
if (cmd == NULL)
|
|
return NULL;
|
|
}
|