postfix-1.1.11-20020918

postfix/HISTORY

@@ -6419,7 +6419,6 @@ Apologies for any names omitted.
 
 20020513
 
-
 	Bugfix: the LDAP client used the "wrong" @ character in
 	addresses with multiple @. LaMont Jones, HP. File:
 	util/dict_ldap.c.
@@ -6969,6 +6968,16 @@ Apologies for any names omitted.
 	compiled in if the PCRE library code is found under
 	/usr/include and /usr/lib.  File: makedefs.
 
+20020918
+
+	Documentation: postsuper(1) did not document the -c option.
+
+	Bugfix: possible longjump() before setjmp(). File:
+	smtpd/smtpd.c.
+
+	Bugfix: pickup should not preserve INSPECT or FILTER records
+	from "postsuper -r". File: pickup/pickup.c.
+
 Open problems:
 
 	Low: smtpd should log queue ID with reject/warn/hold/discard

postfix/html/postsuper.1.html

@@ -5,8 +5,8 @@ POSTSUPER(1)                                         POSTSUPER(1)
        postsuper - Postfix superintendent
 
 <b>SYNOPSIS</b>
-       <b>postsuper</b> [<b>-psv</b>] [<b>-d</b> <i>queue_id</i>] [<b>-h</b> <i>queue_id</i>] [<b>-H</b> <i>queue_id</i>]
+       <b>postsuper</b> [<b>-cpsv</b>] [<b>-d</b> <i>queue_id</i>] [<b>-h</b> <i>queue_id</i>] [<b>-H</b>
-       [<b>-r</b> <i>queue_id</i>] [<i>directory</i> <i>...</i>]
+       <i>queue_id</i>] [<b>-r</b> <i>queue_id</i>] [<i>directory</i> <i>...</i>]
 
 <b>DESCRIPTION</b>
        The <b>postsuper</b> command does maintenance jobs on the Postfix
@@ -20,6 +20,12 @@ POSTSUPER(1)                                         POSTSUPER(1)
 
        Options:
 
+       <b>-c</b> <i>config_dir</i>
+              The <b>main.cf</b> configuration  file  is  in  the  named
+              directory  instead  of  the  default  configuration
+              directory. See  also  the  MAIL_CONFIG  environment
+              setting below.
+
        <b>-d</b> <i>queue_id</i>
               Delete one message with the named queue ID from the
               named  mail  queue(s)  (default:  <b>hold</b>,   <b>incoming</b>,
@@ -147,6 +153,10 @@ POSTSUPER(1)                                         POSTSUPER(1)
        report is written to the standard error stream and to <b>sys-</b>
        <b>logd</b>.
 
+<b>ENVIRONMENT</b>
+       MAIL_CONFIG
+              Directory with the <b>main.cf</b> file.
+
 <b>BUGS</b>
        Mail that is not sanitized by Postfix (i.e.  mail  in  the
        <b>maildrop</b> queue) cannot be placed "on hold".

postfix/man/man1/postsuper.1

@@ -9,7 +9,7 @@ Postfix superintendent
 .na
 .nf
 .fi
-\fBpostsuper\fR [\fB-psv\fR] [\fB-d \fIqueue_id\fR]
+\fBpostsuper\fR [\fB-cpsv\fR] [\fB-d \fIqueue_id\fR]
 [\fB-h \fIqueue_id\fR] [\fB-H \fIqueue_id\fR]
 [\fB-r \fIqueue_id\fR] [\fIdirectory ...\fR]
 .SH DESCRIPTION
@@ -25,6 +25,10 @@ directories - this includes the \fBincoming\fR, \fBactive\fR and
 \fBdefer\fR and \fBflush\fR directories with log files.
 
 Options:
+.IP "\fB-c \fIconfig_dir\fR"
+The \fBmain.cf\fR configuration file is in the named directory
+instead of the default configuration directory. See also the
+MAIL_CONFIG environment setting below.
 .IP "\fB-d \fIqueue_id\fR"
 Delete one message with the named queue ID from the named
 mail queue(s) (default: \fBhold\fR, \fBincoming\fR, \fBactive\fR and
@@ -147,6 +151,13 @@ Problems are reported to the standard error stream and to
 the number of messages requeued with \fB-r\fR, and the number of
 messages whose queue file name was fixed with \fB-s\fR. The report
 is written to the standard error stream and to \fBsyslogd\fR.
+.SH ENVIRONMENT
+.na
+.nf
+.ad
+.fi
+.IP MAIL_CONFIG
+Directory with the \fBmain.cf\fR file.
 .SH BUGS
 .ad
 .fi

postfix/src/global/mail_version.h

@@ -20,7 +20,7 @@
   * Patches change the patchlevel and the release date. Snapshots change the
   * release date only, unless they include the same bugfix as a patch release.
   */
-#define MAIL_RELEASE_DATE	"20020917"
+#define MAIL_RELEASE_DATE	"20020918"
 
 #define VAR_MAIL_VERSION	"mail_version"
 #define DEF_MAIL_VERSION	"1.1.11-" MAIL_RELEASE_DATE

postfix/src/pickup/pickup.c

@@ -218,9 +218,11 @@ static int copy_segment(VSTREAM *qfile, VSTREAM *cleanup, PICKUP_INFO *info,
 	if (type == REC_TYPE_ERTO)
 	    /* Use message header extracted information instead. */
 	    continue;
-	if (type == REC_TYPE_INSP && info->st.st_uid != var_owner_uid)
+	if (type == REC_TYPE_INSP)
+	    /* Use current content inspection settings instead. */
 	    continue;
-	if (type == REC_TYPE_FILT && info->st.st_uid != var_owner_uid)
+	if (type == REC_TYPE_FILT)
+	    /* Use current content filter settings instead. */
 	    continue;
 	else {
 

postfix/src/postsuper/postsuper.c

@@ -5,7 +5,7 @@
 /*	Postfix superintendent
 /* SYNOPSIS
 /* .fi
-/*	\fBpostsuper\fR [\fB-psv\fR] [\fB-d \fIqueue_id\fR]
+/*	\fBpostsuper\fR [\fB-cpsv\fR] [\fB-d \fIqueue_id\fR]
 /*		[\fB-h \fIqueue_id\fR] [\fB-H \fIqueue_id\fR]
 /*		[\fB-r \fIqueue_id\fR] [\fIdirectory ...\fR]
 /* DESCRIPTION
@@ -19,6 +19,10 @@
 /*	\fBdefer\fR and \fBflush\fR directories with log files.
 /*
 /*	Options:
+/* .IP "\fB-c \fIconfig_dir\fR"
+/*	The \fBmain.cf\fR configuration file is in the named directory
+/*	instead of the default configuration directory. See also the
+/*	MAIL_CONFIG environment setting below.
 /* .IP "\fB-d \fIqueue_id\fR"
 /*	Delete one message with the named queue ID from the named
 /*	mail queue(s) (default: \fBhold\fR, \fBincoming\fR, \fBactive\fR and
@@ -139,6 +143,11 @@
 /*	the number of messages requeued with \fB-r\fR, and the number of
 /*	messages whose queue file name was fixed with \fB-s\fR. The report
 /*	is written to the standard error stream and to \fBsyslogd\fR.
+/* ENVIRONMENT
+/* .ad
+/* .fi
+/* .IP MAIL_CONFIG
+/*	Directory with the \fBmain.cf\fR file.
 /* BUGS
 /*	Mail that is not sanitized by Postfix (i.e. mail in the \fBmaildrop\fR
 /*	queue) cannot be placed "on hold".
@@ -838,8 +847,8 @@ static void super(const char **queues, int action)
 	     * move queue files to the "right" subdirectory level. Like the
 	     * hold_one() routine, this code does not touch logfiles, and
 	     * must not touch files in the maildrop queue, because maildrop
-	     * files contain data that has not yet been sanitized and therefore
+	     * files contain data that has not yet been sanitized and
-	     * must not be mixed with already sanitized mail.
+	     * therefore must not be mixed with already sanitized mail.
 	     */
 	    if ((action & ACTION_HOLD_ALL)
 		&& MESSAGE_QUEUE(qp)

postfix/src/smtpd/smtpd.c

@@ -1407,6 +1407,13 @@ static void smtpd_proto(SMTPD_STATE *state)
 	break;
 
     case 0:
+	if (var_smtpd_delay_reject == 0
+	    && (state->access_denied = smtpd_check_client(state)) != 0) {
+	    smtpd_chat_reply(state, "%s", state->access_denied);
+	} else {
+	    smtpd_chat_reply(state, "220 %s", var_smtpd_banner);
+	}
+
 	for (;;) {
 	    if (state->error_count > var_smtpd_hard_erlim) {
 		state->reason = "too many errors";
@@ -1508,24 +1515,13 @@ static void smtpd_service(VSTREAM *stream, char *unused_service, char **argv)
      * machines.
      */
     smtpd_state_init(&state, stream);
+    msg_info("connect from %s[%s]", state.name, state.addr);
 
     /*
      * See if we need to turn on verbose logging for this client.
      */
     debug_peer_check(state.name, state.addr);
 
-    /*
-     * See if we want to talk to this client at all. Then, log the connection
-     * event.
-     */
-    if (var_smtpd_delay_reject == 0
-	&& (state.access_denied = smtpd_check_client(&state)) != 0) {
-	smtpd_chat_reply(&state, "%s", state.access_denied);
-    } else {
-	smtpd_chat_reply(&state, "220 %s", var_smtpd_banner);
-	msg_info("connect from %s[%s]", state.name, state.addr);
-    }
-
     /*
      * Provide the SMTP service.
      */