diff options
Diffstat (limited to 'mfd/savsrv.c')
-rw-r--r-- | mfd/savsrv.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mfd/savsrv.c b/mfd/savsrv.c index 4e90d364..34f95b43 100644 --- a/mfd/savsrv.c +++ b/mfd/savsrv.c | |||
@@ -14,7 +14,7 @@ | |||
14 | You should have received a copy of the GNU General Public License | 14 | You should have received a copy of the GNU General Public License |
15 | along with this program. If not, see <http://www.gnu.org/licenses/>. */ | 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. */ |
16 | 16 | ||
17 | #define MF_SOURCE_NAME MF_SOURCE_CALLOUT | 17 | #define MF_SOURCE_NAME MF_SOURCE_SAVSRV |
18 | #ifdef HAVE_CONFIG_H | 18 | #ifdef HAVE_CONFIG_H |
19 | # include <config.h> | 19 | # include <config.h> |
20 | #endif | 20 | #endif |
@@ -23,11 +23,6 @@ | |||
23 | #include <unistd.h> | 23 | #include <unistd.h> |
24 | #include <stdlib.h> | 24 | #include <stdlib.h> |
25 | #include <stdio.h> | 25 | #include <stdio.h> |
26 | #include <stdarg.h> | ||
27 | #include <syslog.h> | ||
28 | #include <signal.h> | ||
29 | #include <pwd.h> | ||
30 | #include <grp.h> | ||
31 | #include <sys/socket.h> | 26 | #include <sys/socket.h> |
32 | #include <netinet/in.h> | 27 | #include <netinet/in.h> |
33 | #include <arpa/inet.h> | 28 | #include <arpa/inet.h> |
@@ -57,6 +52,7 @@ verify(struct vrfy_queue *qp, FILE *fp) | |||
57 | { | 52 | { |
58 | mf_status rc; | 53 | mf_status rc; |
59 | 54 | ||
55 | mf_proctitle_format("callout server: %s", smtp_io_email(qp->io)); | ||
60 | if (qp->hostname) { | 56 | if (qp->hostname) { |
61 | rc = callout_strict(qp->io, qp->hostname); | 57 | rc = callout_strict(qp->io, qp->hostname); |
62 | if (mf_resolved(rc)) | 58 | if (mf_resolved(rc)) |
@@ -192,6 +188,7 @@ callout_session_server(const char *id, int fd, | |||
192 | char *buf = NULL; | 188 | char *buf = NULL; |
193 | size_t size = 0; | 189 | size_t size = 0; |
194 | 190 | ||
191 | mf_proctitle_format("callout server"); | ||
195 | setvbuf(fp, NULL, _IOLBF, 0); | 192 | setvbuf(fp, NULL, _IOLBF, 0); |
196 | fprintf(fp, "OK mailfromd callout server ready\r\n"); | 193 | fprintf(fp, "OK mailfromd callout server ready\r\n"); |
197 | while (getline(&buf, &size, fp) >= 0) { | 194 | while (getline(&buf, &size, fp) >= 0) { |
@@ -201,6 +198,8 @@ callout_session_server(const char *id, int fd, | |||
201 | int rc = 0; | 198 | int rc = 0; |
202 | 199 | ||
203 | trimcrlf(buf); | 200 | trimcrlf(buf); |
201 | debug1(2,"C: %s", buf); | ||
202 | |||
204 | if (mu_argcv_get(buf, "", NULL, &argc, &argv)) { | 203 | if (mu_argcv_get(buf, "", NULL, &argc, &argv)) { |
205 | fprintf(fp, "NO cannot parse line\r\n"); | 204 | fprintf(fp, "NO cannot parse line\r\n"); |
206 | continue; | 205 | continue; |
@@ -218,7 +217,8 @@ callout_session_server(const char *id, int fd, | |||
218 | break; | 217 | break; |
219 | } | 218 | } |
220 | fclose(fp); | 219 | fclose(fp); |
221 | 220 | free(buf); | |
221 | |||
222 | /* Run queued verifications */ | 222 | /* Run queued verifications */ |
223 | run_queue(NULL); | 223 | run_queue(NULL); |
224 | return 0; | 224 | return 0; |