mir/postfix
2
0
Fork 0
mirror of https://github.com/vdukhovni/postfix synced 2025-08-30 13:48:06 +00:00
Code Issues Releases Wiki Activity

snapshot-20010324

Browse Source
This commit is contained in:
Wietse Venema 2001-03-24 00:00:00 -05:00 committed by Viktor Dukhovni
parent c70c1482d6
commit 709dd6ee2a
5 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
postfix/src/flush/flush.c
View File

@ -249,7 +249,8 @@ static int flush_add_service(const char *site, const char *queue_id)
* Map site to path and update log. * Map site to path and update log.
*/ */
site_path = flush_site_to_path((VSTRING *) 0, site); site_path = flush_site_to_path((VSTRING *) 0, site);
status = flush_add_path(STR(site_path), queue_id); status = valid_hostname(STR(site_path), DONT_GRIPE) ?
flush_add_path(STR(site_path), queue_id) : FLUSH_STAT_BAD;
vstring_free(site_path); vstring_free(site_path);
return (status); return (status);
@ -317,7 +318,8 @@ static int flush_send_service(const char *site)
* Map site name to path name and flush the log. * Map site name to path name and flush the log.
*/ */
site_path = flush_site_to_path((VSTRING *) 0, site); site_path = flush_site_to_path((VSTRING *) 0, site);
status = flush_send_path(STR(site_path)); status = valid_hostname(STR(site_path), DONT_GRIPE) ?
flush_send_path(STR(site_path)) : FLUSH_STAT_BAD;
vstring_free(site_path); vstring_free(site_path);
return (status); return (status);

2
postfix/src/global/mail_version.h
View File

@ -15,7 +15,7 @@
* Version of this program. * Version of this program.
*/ */
#define VAR_MAIL_VERSION "mail_version" #define VAR_MAIL_VERSION "mail_version"
#define DEF_MAIL_VERSION "Snapshot-20010323" #define DEF_MAIL_VERSION "Snapshot-20010324"
extern char *var_mail_version; extern char *var_mail_version;
/* LICENSE /* LICENSE

1
postfix/src/util/inet_trigger.c
View File

@ -79,6 +79,7 @@ static void inet_trigger_event(int event, char *context)
*/ */
if (event == EVENT_TIME) if (event == EVENT_TIME)
msg_warn("%s: read timeout for service %s", myname, ip->service); msg_warn("%s: read timeout for service %s", myname, ip->service);
event_disable_readwrite(ip->fd);
if (close(ip->fd) < 0) if (close(ip->fd) < 0)
msg_warn("%s: close %s: %m", myname, ip->service); msg_warn("%s: close %s: %m", myname, ip->service);
myfree(ip->service); myfree(ip->service);

1
postfix/src/util/stream_trigger.c
View File

@ -76,6 +76,7 @@ static void stream_trigger_event(int event, char *context)
*/ */
if (event == EVENT_TIME) if (event == EVENT_TIME)
msg_warn("%s: read timeout for service %s", myname, sp->service); msg_warn("%s: read timeout for service %s", myname, sp->service);
event_disable_readwrite(sp->fd);
if (close(sp->fd) < 0) if (close(sp->fd) < 0)
msg_warn("%s: close %s: %m", myname, sp->service); msg_warn("%s: close %s: %m", myname, sp->service);
myfree(sp->service); myfree(sp->service);

1
postfix/src/util/unix_trigger.c
View File

@ -77,6 +77,7 @@ static void unix_trigger_event(int event, char *context)
*/ */
if (event == EVENT_TIME) if (event == EVENT_TIME)
msg_warn("%s: read timeout for service %s", myname, up->service); msg_warn("%s: read timeout for service %s", myname, up->service);
event_disable_readwrite(up->fd);
if (close(up->fd) < 0) if (close(up->fd) < 0)
msg_warn("%s: close %s: %m", myname, up->service); msg_warn("%s: close %s: %m", myname, up->service);
myfree(up->service); myfree(up->service);